diff options
-rw-r--r-- | lib/Makefile.in | 95 | ||||
-rw-r--r-- | tests/du/Makefile.in | 2 | ||||
-rw-r--r-- | tests/ls/Makefile.in | 5 |
3 files changed, 72 insertions, 30 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index 60716705e..6d9bca62a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -153,6 +153,11 @@ noinst_LIBRARIES = libfetish.a INCLUDES = -I.. -I$(srcdir) +nodist_libfetish_a_SOURCES = \ + safe-read.c \ + safe-write.c + + libfetish_a_SOURCES = \ acl.h acl.c \ getdate.h getdate.y \ @@ -215,7 +220,8 @@ libfetish_a_SOURCES = \ readtokens.c readtokens.h \ readutmp.h \ regex.h \ - safe-read.c safe-read.h \ + safe-read.h \ + safe-write.h \ same.c same.h \ save-cwd.c save-cwd.h \ savedir.c savedir.h \ @@ -250,11 +256,12 @@ libfetish_a_SOURCES = \ libfetish_a_LIBADD = @LIBOBJS@ @ALLOCA@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD) -BUILT_SOURCES = getdate.c lstat.c stat.c unlocked-io.h +BUILT_SOURCES = getdate.c lstat.c stat.c safe-read.c safe-write.c unlocked-io.h MAINTAINERCLEANFILES = $(BUILT_SOURCES) -DISTCLEANFILES = lstat.c stat.c unlocked-io.h +DISTCLEANFILES = lstat.c stat.c safe-read.c safe-write.c unlocked-io.h -EXTRA_DIST = xstat.in config.charset ref-add.sin ref-del.sin gen-uio \ +EXTRA_DIST = xstat.in safe-rw.in config.charset \ + ref-add.sin ref-del.sin gen-uio \ fnmatch_loop.c inttostr.c inttostr.h @@ -295,10 +302,9 @@ am_libfetish_a_OBJECTS = acl$U.$(OBJEXT) getdate$U.$(OBJEXT) \ memcasecmp$U.$(OBJEXT) memcoll$U.$(OBJEXT) \ modechange$U.$(OBJEXT) offtostr$U.$(OBJEXT) \ path-concat$U.$(OBJEXT) physmem$U.$(OBJEXT) quote$U.$(OBJEXT) \ - quotearg$U.$(OBJEXT) readtokens$U.$(OBJEXT) \ - safe-read$U.$(OBJEXT) same$U.$(OBJEXT) save-cwd$U.$(OBJEXT) \ - savedir$U.$(OBJEXT) settime$U.$(OBJEXT) sha$U.$(OBJEXT) \ - stripslash$U.$(OBJEXT) umaxtostr$U.$(OBJEXT) \ + quotearg$U.$(OBJEXT) readtokens$U.$(OBJEXT) same$U.$(OBJEXT) \ + save-cwd$U.$(OBJEXT) savedir$U.$(OBJEXT) settime$U.$(OBJEXT) \ + sha$U.$(OBJEXT) stripslash$U.$(OBJEXT) umaxtostr$U.$(OBJEXT) \ unicodeio$U.$(OBJEXT) userspec$U.$(OBJEXT) \ version-etc$U.$(OBJEXT) xgetcwd$U.$(OBJEXT) \ xgethostname$U.$(OBJEXT) xmalloc$U.$(OBJEXT) \ @@ -306,7 +312,10 @@ am_libfetish_a_OBJECTS = acl$U.$(OBJEXT) getdate$U.$(OBJEXT) \ xreadlink$U.$(OBJEXT) xstrdup$U.$(OBJEXT) xstrtod$U.$(OBJEXT) \ xstrtol$U.$(OBJEXT) xstrtoul$U.$(OBJEXT) xstrtoimax$U.$(OBJEXT) \ xstrtoumax$U.$(OBJEXT) yesno$U.$(OBJEXT) -libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS) +nodist_libfetish_a_OBJECTS = safe-read$U.$(OBJEXT) \ + safe-write$U.$(OBJEXT) +libfetish_a_OBJECTS = $(am_libfetish_a_OBJECTS) \ + $(nodist_libfetish_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -375,7 +384,8 @@ am__depfiles_maybe = depfiles @AMDEP_TRUE@ ./$(DEPDIR)/posixver$U.Po ./$(DEPDIR)/quote$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/quotearg$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/readtokens$U.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/safe-read$U.Po ./$(DEPDIR)/same$U.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/safe-read$U.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/safe-write$U.Po ./$(DEPDIR)/same$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/save-cwd$U.Po ./$(DEPDIR)/savedir$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/settime$U.Po ./$(DEPDIR)/sha$U.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/strftime$U.Po \ @@ -412,7 +422,7 @@ DIST_COMMON = README ChangeLog Makefile.am Makefile.in TODO \ strncasecmp.c strndup.c strnlen.c strpbrk.c strstr.c strtod.c \ strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c strtoumax.c \ strverscmp.c tempname.c utime.c -SOURCES = $(libfetish_a_SOURCES) +SOURCES = $(libfetish_a_SOURCES) $(nodist_libfetish_a_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -559,6 +569,7 @@ mostlyclean-kr: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readtokens$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read$U.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-write$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/same$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd$U.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/savedir$U.Po@am__quote@ @@ -790,6 +801,8 @@ rpmatch_.c: lib/rpmatch.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lib/rpmatch.c; then echo $(srcdir)/lib/rpmatch.c; else echo lib/rpmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > rpmatch_.c || rm -f rpmatch_.c safe-read_.c: safe-read.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/safe-read.c; then echo $(srcdir)/safe-read.c; else echo safe-read.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > safe-read_.c || rm -f safe-read_.c +safe-write_.c: safe-write.c $(ANSI2KNR) + $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/safe-write.c; then echo $(srcdir)/safe-write.c; else echo safe-write.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > safe-write_.c || rm -f safe-write_.c same_.c: same.c $(ANSI2KNR) $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/same.c; then echo $(srcdir)/same.c; else echo same.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > same_.c || rm -f same_.c save-cwd_.c: save-cwd.c $(ANSI2KNR) @@ -909,22 +922,22 @@ physmem_.$(OBJEXT) posixtm_.$(OBJEXT) posixver_.$(OBJEXT) \ putenv_.$(OBJEXT) quote_.$(OBJEXT) quotearg_.$(OBJEXT) raise_.$(OBJEXT) \ readtokens_.$(OBJEXT) readutmp_.$(OBJEXT) realloc_.$(OBJEXT) \ regex_.$(OBJEXT) rename_.$(OBJEXT) rmdir_.$(OBJEXT) rpmatch_.$(OBJEXT) \ -safe-read_.$(OBJEXT) same_.$(OBJEXT) save-cwd_.$(OBJEXT) \ -savedir_.$(OBJEXT) settime_.$(OBJEXT) sha_.$(OBJEXT) sig2str_.$(OBJEXT) \ -stat_.$(OBJEXT) stpcpy_.$(OBJEXT) strcasecmp_.$(OBJEXT) \ -strcspn_.$(OBJEXT) strdup_.$(OBJEXT) strftime_.$(OBJEXT) \ -stripslash_.$(OBJEXT) strncasecmp_.$(OBJEXT) strndup_.$(OBJEXT) \ -strnlen_.$(OBJEXT) strpbrk_.$(OBJEXT) strstr_.$(OBJEXT) \ -strtod_.$(OBJEXT) strtoimax_.$(OBJEXT) strtol_.$(OBJEXT) \ -strtoll_.$(OBJEXT) strtoul_.$(OBJEXT) strtoull_.$(OBJEXT) \ -strtoumax_.$(OBJEXT) strverscmp_.$(OBJEXT) tempname_.$(OBJEXT) \ -umaxtostr_.$(OBJEXT) unicodeio_.$(OBJEXT) userspec_.$(OBJEXT) \ -utime_.$(OBJEXT) version-etc_.$(OBJEXT) xgetcwd_.$(OBJEXT) \ -xgethostname_.$(OBJEXT) xmalloc_.$(OBJEXT) xmemcoll_.$(OBJEXT) \ -xnanosleep_.$(OBJEXT) xreadlink_.$(OBJEXT) xstrdup_.$(OBJEXT) \ -xstrtod_.$(OBJEXT) xstrtoimax_.$(OBJEXT) xstrtol_.$(OBJEXT) \ -xstrtoul_.$(OBJEXT) xstrtoumax_.$(OBJEXT) yesno_.$(OBJEXT) : \ -$(ANSI2KNR) +safe-read_.$(OBJEXT) safe-write_.$(OBJEXT) same_.$(OBJEXT) \ +save-cwd_.$(OBJEXT) savedir_.$(OBJEXT) settime_.$(OBJEXT) \ +sha_.$(OBJEXT) sig2str_.$(OBJEXT) stat_.$(OBJEXT) stpcpy_.$(OBJEXT) \ +strcasecmp_.$(OBJEXT) strcspn_.$(OBJEXT) strdup_.$(OBJEXT) \ +strftime_.$(OBJEXT) stripslash_.$(OBJEXT) strncasecmp_.$(OBJEXT) \ +strndup_.$(OBJEXT) strnlen_.$(OBJEXT) strpbrk_.$(OBJEXT) \ +strstr_.$(OBJEXT) strtod_.$(OBJEXT) strtoimax_.$(OBJEXT) \ +strtol_.$(OBJEXT) strtoll_.$(OBJEXT) strtoul_.$(OBJEXT) \ +strtoull_.$(OBJEXT) strtoumax_.$(OBJEXT) strverscmp_.$(OBJEXT) \ +tempname_.$(OBJEXT) umaxtostr_.$(OBJEXT) unicodeio_.$(OBJEXT) \ +userspec_.$(OBJEXT) utime_.$(OBJEXT) version-etc_.$(OBJEXT) \ +xgetcwd_.$(OBJEXT) xgethostname_.$(OBJEXT) xmalloc_.$(OBJEXT) \ +xmemcoll_.$(OBJEXT) xnanosleep_.$(OBJEXT) xreadlink_.$(OBJEXT) \ +xstrdup_.$(OBJEXT) xstrtod_.$(OBJEXT) xstrtoimax_.$(OBJEXT) \ +xstrtol_.$(OBJEXT) xstrtoul_.$(OBJEXT) xstrtoumax_.$(OBJEXT) \ +yesno_.$(OBJEXT) : $(ANSI2KNR) .y.c: $(YACCCOMPILE) `test -f '$<' || echo '$(srcdir)/'`$< @@ -1143,6 +1156,30 @@ stat.c: xstat.in $(srcdir)/xstat.in > t-$@ mv t-$@ $@ +safe-read.c: safe-rw.in + sed \ + -e '/@IGNORE@/d' \ + -e 's/@const@//g' \ + -e 's/@rw@/read/g' \ + -e 's/@Rw@/Read/g' \ + -e 's/@RW@/READ/g' \ + -e 's/@read_written@/read/g' \ + -e 's/@from_to@/from/g' \ + $(srcdir)/safe-rw.in > t-$@ + mv t-$@ $@ + +safe-write.c: safe-rw.in + sed \ + -e '/@IGNORE@/d' \ + -e 's/@const@/const /g' \ + -e 's/@rw@/write/g' \ + -e 's/@Rw@/Write/g' \ + -e 's/@RW@/WRITE/g' \ + -e 's/@read_written@/written/g' \ + -e 's/@from_to@/to/g' \ + $(srcdir)/safe-rw.in > t-$@ + mv t-$@ $@ + # The following is needed in order to install a simple file in $(libdir) # which is shared with other installed packages. We use a list of referencing # packages so that "make uninstall" will remove the file if and only if it @@ -1150,7 +1187,9 @@ stat.c: xstat.in # On systems with glibc-2.1 or newer, the file is redundant, therefore we # avoid installing it. -all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c unlocked-io.h +all-local: charset.alias ref-add.sed ref-del.sed \ + safe-read.c safe-write.c \ + lstat.c stat.c unlocked-io.h install-exec-local: all-local $(mkinstalldirs) $(DESTDIR)$(libdir) if test -f $(charset_alias); then \ diff --git a/tests/du/Makefile.in b/tests/du/Makefile.in index 24f6d8de1..8dcc5c9f9 100644 --- a/tests/du/Makefile.in +++ b/tests/du/Makefile.in @@ -148,7 +148,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.4 gnits -TESTS = deref two-args slink +TESTS = trailing-slash deref two-args slink EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ PATH=`pwd`/../../src:$$PATH diff --git a/tests/ls/Makefile.in b/tests/ls/Makefile.in index 28425dcdc..1db99f26a 100644 --- a/tests/ls/Makefile.in +++ b/tests/ls/Makefile.in @@ -149,7 +149,10 @@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = 1.2 gnits -TESTS = recursive dired infloop rt-1 time-1 symlink-slash follow-slink no-arg +TESTS = \ + file-type recursive dired infloop \ + rt-1 time-1 symlink-slash follow-slink no-arg + EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ |