From 4c722a96ba32e2a32fad410cd7047acba4e880db Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 6 Nov 1994 17:51:23 +0000 Subject: merge with 1.12 --- lib/Makefile.in | 4 +++- lib/makepath.c | 11 +++++++++++ lib/obstack.h | 2 +- old/fileutils/ChangeLog | 19 ++++++++++++++++++- old/fileutils/NEWS | 4 ++++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/lib/Makefile.in b/lib/Makefile.in index bca5e5636..c1ba84d49 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -48,7 +48,7 @@ stripslash.o xgetcwd.o xmalloc.o xstrdup.o userspec.o yesno.o \ @LIBOBJS@ @ALLOCA@ DISTFILES = Makefile.in backupfile.h getopt.h long-options.h modechange.h \ -fnmatch.h fsusage.h makepath.h mountlist.h obstack.h pathmax.h \ +fnmatch.h fsusage.h group-member.h makepath.h mountlist.h obstack.h pathmax.h \ safe-xstat.cin safe-xstat.hin getdate.c posixtm.c $(SOURCES) all: libfu.a @@ -153,6 +153,8 @@ mountlist.o: mountlist.h xgetcwd.o: pathmax.h euidaccess.o fsusage.o isdir.o makepath.o mkdir.o rename.o: safe-stat.h makepath.o: makepath.h +obstack.o: obstack.h +group-member.o: group-member.h # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/makepath.c b/lib/makepath.c index 9066874cd..b59211672 100644 --- a/lib/makepath.c +++ b/lib/makepath.c @@ -99,6 +99,16 @@ void error (); Return 0 if ARGPATH exists as a directory with the proper ownership and permissions when done, otherwise 1. */ +#if defined (__GNUC__) || (defined (__STDC__) && __STDC__) +int +make_path (const char *argpath, + int mode, + int parent_mode, + uid_t owner, + gid_t group, + int preserve_existing, + const char *verbose_fmt_string) +#else int make_path (argpath, mode, parent_mode, owner, group, preserve_existing, verbose_fmt_string) @@ -109,6 +119,7 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, gid_t group; int preserve_existing; const char *verbose_fmt_string; +#endif { char *dirpath; /* A copy we can scribble NULs on. */ struct stat stats; diff --git a/lib/obstack.h b/lib/obstack.h index 2f5ec61ae..1f0b5269b 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -272,7 +272,7 @@ int obstack_chunk_size (struct obstack *obstack); /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and does not implement __extension__. But that compiler doesn't define __GNUC_MINOR__. */ -#if __GNUC__ < 2 || (NeXt && !__GNUC_MINOR__) +#if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__) #define __extension__ #endif diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog index e29819a2f..a071b04fe 100644 --- a/old/fileutils/ChangeLog +++ b/old/fileutils/ChangeLog @@ -1,6 +1,23 @@ +Sun Nov 06 00:18:56 1994 Jim Meyering (meyering@comco.com) + + * Version 3.12. + +Sat Nov 05 15:20:07 1994 Jim Meyering (meyering@comco.com) + + * group-member.c: Use up-to-date version. + * group-member.h: New file. + * lib/Makefile.in (DISTFILES): Add group-member.h. + (group-member.o): Depend on group-member.h. + + * Version 3.11. + + * src/Makefile.in (obstack.o): Depend on obstack.h. + * makepath.c (makepath) [__STDC__]: Add an ANSI-style prototype. + From Kaveh Ghazi. + Fri Nov 04 17:27:55 1994 Jim Meyering (meyering@comco.com) - Version 3.10. + * Version 3.10. Thu Nov 03 12:59:34 1994 Jim Meyering (meyering@comco.com) diff --git a/old/fileutils/NEWS b/old/fileutils/NEWS index 7c6498dc2..f45d75e34 100644 --- a/old/fileutils/NEWS +++ b/old/fileutils/NEWS @@ -1,3 +1,7 @@ +User-visible changes in release 3.12: +* None. +User-visible changes in release 3.11: +* None. User-visible changes in release 3.10: * mkdir -p now ignores arguments that are existing directories. Before, (contrary to POSIX spec) it would attempt to change ownership and/or -- cgit v1.2.3-70-g09d2