Mercurial > hg > octave-shane > gnulib-hg
view modules/sys_times @ 17074:d4ccb0388f18
fts: reduce two or more trailing slashes to just one, usually
* lib/fts.c (fts_open): Upon initialization, if a name ends in two
or more slashes, trim all but the final one. But if a name consists
solely of two slashes, don't modify it. If it consists solely of
three or more slashes, strip all but one.
This is part of the solution to a minor problem with rm:
it would print a bogus ELOOP diagnostic when failing to remove
the slash-decorated name of a symlink-to-directory:
$ mkdir d && ln -s d s && env rm -r s/
rm: cannot remove 's': Too many levels of symbolic links
With the change below and a trivial don't-trim-trailing-slashes
adjustment to remove.c, it does this:
$ env rm -r s/
rm: cannot remove 's/': Not a directory
Improved by: Eric Blake
author | Jim Meyering <meyering@redhat.com> |
---|---|
date | Tue, 04 Sep 2012 11:36:38 +0200 |
parents | d2437ed29d20 |
children |
line wrap: on
line source
Description: A <sys/times.h> for systems lacking it. Files: lib/sys_times.in.h m4/sys_times_h.m4 Depends-on: include_next snippet/arg-nonnull snippet/warn-on-use configure.ac: gl_SYS_TIMES_H AC_PROG_MKDIR_P Makefile.am: BUILT_SOURCES += sys/times.h # We need the following in order to create <sys/times.h> when the system # doesn't have one that works with the given compiler. sys/times.h: sys_times.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H) $(AM_V_at)$(MKDIR_P) sys $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ -e 's/@''HAVE_SYS_TIMES_H''@/$(HAVE_SYS_TIMES_H)/g' \ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_SYS_TIMES_H''@|$(NEXT_SYS_TIMES_H)|g' \ -e 's/@''GNULIB_TIMES''@/$(GNULIB_TIMES)/g' \ -e 's|@''HAVE_STRUCT_TMS''@|$(HAVE_STRUCT_TMS)|g' \ -e 's|@''HAVE_TIMES''@|$(HAVE_TIMES)|g' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ < $(srcdir)/sys_times.in.h; \ } > $@-t && \ mv $@-t $@ MOSTLYCLEANFILES += sys/times.h sys/times.h-t MOSTLYCLEANDIRS += sys Include: <sys/times.h> License: LGPLv2+ Maintainer: Simon Josefsson