mirror of
https://github.com/coreutils/coreutils.git
synced 2024-11-26 11:23:47 +08:00
merge with 3.5.1
This commit is contained in:
parent
a4bfda47ac
commit
93dcd18946
@ -43,7 +43,7 @@ fnmatch.h fsusage.h mountlist.h pathmax.h system.h $(SOURCES)
|
||||
all: libfu.a
|
||||
|
||||
.c.o:
|
||||
$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) -I$(srcdir) $<
|
||||
$(CC) -c $(DEFS) -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $<
|
||||
|
||||
install: all
|
||||
|
||||
|
@ -43,8 +43,11 @@ char *alloca ();
|
||||
#endif
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#if defined (STDC_HEADERS) || defined (HAVE_ERRNO_H)
|
||||
#include <errno.h>
|
||||
#else
|
||||
extern int errno;
|
||||
#endif
|
||||
@ -147,7 +150,7 @@ make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string)
|
||||
|
||||
if (owner != (uid_t) -1 && group != (gid_t) -1
|
||||
&& chown (dirpath, owner, group)
|
||||
#ifdef AFS
|
||||
#if defined(AFS) && defined (EPERM)
|
||||
&& errno != EPERM
|
||||
#endif
|
||||
)
|
||||
|
@ -1,3 +1,40 @@
|
||||
Fri Apr 30 02:21:48 1993 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* ls.c (main): Make `-f' work like on standard Unix ls, instead
|
||||
of as a short equivalent of --full-time.
|
||||
* ls.1: Document it.
|
||||
|
||||
Thu Apr 29 00:46:46 1993 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* src/Makefile.in [dir.o, vdir.o]: Make ordering of CFLAGS etc
|
||||
in compilation rules consistent with that in .c.o rule.
|
||||
|
||||
* Makefile.in (dist): Depend on Makefile so that changes to
|
||||
Makefile.in (like adding new files to DISTRIB) are reflected
|
||||
in the new distribution.
|
||||
|
||||
Tue Apr 27 21:35:11 1993 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* configure.in: Remove unnecessary AC_PROG_INSTALL.
|
||||
|
||||
Fri Apr 23 23:39:16 1993 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* {lib,src}/Makefile.in [.c.o]: Make CPPFLAGS and CFLAGS follow
|
||||
other options so users can use them to override DEFS.
|
||||
|
||||
* lib/mktime.c: Use new version from glibc instead of one from
|
||||
libc-subst. `touch' built with the latter didn't set proper
|
||||
time unless given a specific --date option.
|
||||
|
||||
Thu Apr 22 00:22:25 1993 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* makepath.c: Decouple inclusion of errno.h from definition of
|
||||
STDC_HEADERS; many systems have errno.h, yet shouldn't define
|
||||
STDC_HEADERS.
|
||||
* makepath.c (make_path): Add EPERM clause only if both AFS and
|
||||
EPERM are defined.
|
||||
* configure.in: Test for errno.h header file.
|
||||
|
||||
Mon Apr 19 11:21:14 1993 Jim Meyering (meyering@comco.com)
|
||||
|
||||
* Version 3.5.
|
||||
|
@ -1,3 +1,6 @@
|
||||
Major changes in release 3.6:
|
||||
* GNU ls -f works like Unix ls -f
|
||||
|
||||
Major changes in release 3.5:
|
||||
* adds support for DEC Alpha under OSF/1
|
||||
* configuring with gcc uses CFLAGS='-g -O' by default
|
||||
|
13
src/ls.c
13
src/ls.c
@ -214,7 +214,7 @@ enum time_type
|
||||
|
||||
static enum time_type time_type;
|
||||
|
||||
/* print the full time, -f, otherwise the standard unix heuristics. */
|
||||
/* print the full time, otherwise the standard unix heuristics. */
|
||||
|
||||
int full_time;
|
||||
|
||||
@ -367,7 +367,7 @@ static struct option const long_options[] =
|
||||
{"all", no_argument, 0, 'a'},
|
||||
{"escape", no_argument, 0, 'b'},
|
||||
{"directory", no_argument, 0, 'd'},
|
||||
{"full-time", no_argument, 0, 'f'},
|
||||
{"full-time", no_argument, &full_time, 1},
|
||||
{"inode", no_argument, 0, 'i'},
|
||||
{"kilobytes", no_argument, 0, 'k'},
|
||||
{"numeric-uid-gid", no_argument, 0, 'n'},
|
||||
@ -605,7 +605,14 @@ decode_switches (argc, argv)
|
||||
break;
|
||||
|
||||
case 'f':
|
||||
full_time = 1;
|
||||
/* Same as enabling -a -U and disabling -l -s. */
|
||||
all_files = 1;
|
||||
really_all_files = 1;
|
||||
sort_type = sort_none;
|
||||
/* disable -l */
|
||||
if (format == long_format)
|
||||
format = (isatty (1) ? many_per_line : one_per_line);
|
||||
print_block_size = 0; /* disable -s */
|
||||
break;
|
||||
|
||||
case 'g':
|
||||
|
Loading…
Reference in New Issue
Block a user