%n fileutils %v 3.13 %c * %l * %b * %d * %f * %t fileutils-3.13.tgz %w Gnu %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N fileutils-3.13/doc/Makefile.in fileutils-MCC/doc/Makefile.in --- fileutils-3.13/doc/Makefile.in Fri Jul 12 04:31:42 1996 +++ fileutils-MCC/doc/Makefile.in Sun Aug 11 18:39:34 1996 @@ -155,5 +155,5 @@ install-exec: -install-data: install-info +install-data: install: install-exec install-data all diff -ru2N fileutils-3.13/intl/Makefile.in fileutils-MCC/intl/Makefile.in --- fileutils-3.13/intl/Makefile.in Sat Jul 6 04:04:23 1996 +++ fileutils-MCC/intl/Makefile.in Sun Aug 11 19:59:56 1996 @@ -99,4 +99,5 @@ # package, you have to use `configure --with-included-gettext'. install: all +dummy: if test "$(PACKAGE)" = "gettext"; then \ if test -r $(MKINSTALLDIRS); then \ diff -ru2N fileutils-3.13/lib/Makefile.in fileutils-MCC/lib/Makefile.in --- fileutils-3.13/lib/Makefile.in Fri Jul 12 04:31:46 1996 +++ fileutils-MCC/lib/Makefile.in Sun Aug 11 18:42:21 1996 @@ -75,5 +75,5 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = -O6 LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ diff -ru2N fileutils-3.13/man/Makefile.in fileutils-MCC/man/Makefile.in --- fileutils-3.13/man/Makefile.in Fri Jul 12 04:31:46 1996 +++ fileutils-MCC/man/Makefile.in Sun Aug 11 19:59:30 1996 @@ -35,5 +35,5 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DATA = install -m 444 INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -141,4 +141,7 @@ echo installing rm.1 as $(mandir)/man$$sect/$$inst; \ $(INSTALL_DATA) $(srcdir)/rm.1 $(mandir)/man$$sect/$$inst + (cd /usr/man/man1;gzip -9f chgrp.1 chmod.1 chown.1 cp.1 \ + dd.1 df.1 dircolors.1 du.1 install.1 ln.1 ls.1 mkdir.1 \ + mkfifo.1 mknod.1 mv.1 rm.1 rmdir.1 touch.1) uninstall-man: diff -ru2N fileutils-3.13/man/ls.1 fileutils-MCC/man/ls.1 --- fileutils-3.13/man/ls.1 Fri Jul 12 03:33:52 1996 +++ fileutils-MCC/man/ls.1 Sun Aug 11 18:48:43 1996 @@ -1,5 +1,5 @@ .TH LS 1 "GNU File Utilities" "FSF" \" -*- nroff -*- .SH NAME -ls, dir, vdir \- list contents of directories +ls, dir, vdir, ll, lsf \- list contents of directories .SH SYNOPSIS .B ls @@ -21,5 +21,7 @@ documents the GNU version of .BR ls . -.B dir +.BR dir , +.BR ll , +.BR lsf , and .B vdir @@ -35,5 +37,5 @@ .BR dir , files are by default listed in columns, sorted vertically. For -.BR vdir , +.BR vdir and ll , files are by default listed in long format. .SS OPTIONS diff -ru2N fileutils-3.13/src/Makefile.in fileutils-MCC/src/Makefile.in --- fileutils-3.13/src/Makefile.in Fri Jul 12 04:31:53 1996 +++ fileutils-MCC/src/Makefile.in Sun Aug 11 19:58:31 1996 @@ -14,5 +14,5 @@ exec_prefix = @exec_prefix@ -bindir = @bindir@ +bindir = /bin sbindir = @sbindir@ libexecdir = @libexecdir@ @@ -34,5 +34,5 @@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = install -s -m 555 INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -45,5 +45,5 @@ bin_PROGRAMS = chgrp chown chmod cp dd dircolors du \ -ginstall ln dir vdir ls mkdir \ +ginstall ln ls mkdir \ mkfifo mknod mv rm rmdir sync touch @DF_PROG@ @@ -88,5 +88,5 @@ YACC = @YACC@ CPPFLAGS = @CPPFLAGS@ -CFLAGS = @CFLAGS@ +CFLAGS = -O6 -fomit-frame-pointer LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ @@ -137,5 +137,5 @@ EXTRA_vdir_SOURCES = vdir_LDADD = $(LDADD) -ls_OBJECTS = ls$o ls-ls$o +ls_OBJECTS = ls$o EXTRA_ls_SOURCES = ls_LDADD = $(LDADD) @@ -226,4 +226,5 @@ else :; fi; \ done + (cd $(bindir);for i in ll lsf dir vdir;do ln -f ls $$i;done) uninstall-binPROGRAMS: diff -ru2N fileutils-3.13/src/cp-aux.c fileutils-MCC/src/cp-aux.c --- fileutils-3.13/src/cp-aux.c Sat Jul 6 23:38:09 1996 +++ fileutils-MCC/src/cp-aux.c Sun Aug 11 18:56:07 1996 @@ -58,4 +58,5 @@ -v, --verbose explain what is being done\n\ -x, --one-file-system stay on this file system\n\ + -M, --make-holes create holes in sparse files\n\ -P, --parents append source path to DIRECTORY\n\ -R, --recursive copy directories recursively\n\ diff -ru2N fileutils-3.13/src/cp.c fileutils-MCC/src/cp.c --- fileutils-3.13/src/cp.c Fri Jun 21 16:29:55 1996 +++ fileutils-MCC/src/cp.c Sun Aug 11 19:06:42 1996 @@ -188,4 +188,5 @@ {"no-dereference", no_argument, &flag_dereference, 0}, {"one-file-system", no_argument, &flag_one_file_system, 1}, + {"make-holes", no_argument, NULL, 'M'}, {"parents", no_argument, &flag_path, 1}, {"path", no_argument, &flag_path, 1}, @@ -228,5 +229,5 @@ umask_kill = 0777777 ^ umask (0); - while ((c = getopt_long (argc, argv, "abdfilprsuvxPRS:V:", long_opts, + while ((c = getopt_long (argc, argv, "abdfilprsuvxMPRS:V:", long_opts, (int *) 0)) != EOF) { @@ -316,4 +317,8 @@ case 'x': flag_one_file_system = 1; + break; + + case 'M': + flag_sparse = SPARSE_ALWAYS; break; diff -ru2N fileutils-3.13/src/ls.c fileutils-MCC/src/ls.c --- fileutils-3.13/src/ls.c Mon Jul 8 05:23:47 1996 +++ fileutils-MCC/src/ls.c Sun Aug 11 19:45:18 1996 @@ -65,5 +65,4 @@ #include "obstack.h" -#include "ls.h" #include "error.h" #include "argmatch.h" @@ -658,5 +657,39 @@ pending_dirs = 0; current_time = time ((time_t *) 0); - + qmark_funny_chars = 0; + quote_funny_chars = 0; + indicator_style = none; + + { + char *name = strrchr(program_name, '/'); + if (name) name++; + else name = program_name; + program_name = name; + if (!strcmp(name, "ll") || !strcmp(name, "vdir")) { + format = long_format; + quote_funny_chars = 1; + } + else if (!strcmp(name, "dir")) { + format = many_per_line; + quote_funny_chars = 1; + } + else { + if (!strcmp(name, "lsf")) { + indicator_style = all; + format = many_per_line; + quote_funny_chars = 1; + } + if (isatty (1)) + { + format = many_per_line; + qmark_funny_chars = 1; + } + else + { + format = one_per_line; + qmark_funny_chars = 0; + } + } + } i = decode_switches (argc, argv); @@ -664,6 +697,5 @@ { printf ("%s - %s\n", - (ls_mode == LS_LS ? "ls" - : (ls_mode == LS_MULTI_COL ? "dir" : "vdir")), + program_name, PACKAGE_VERSION); exit (0); @@ -755,41 +787,6 @@ long int tmp_long; - qmark_funny_chars = 0; - quote_funny_chars = 0; - /* initialize all switches to default settings */ - switch (ls_mode) - { - case LS_MULTI_COL: - /* This is for the `dir' program. */ - format = many_per_line; - quote_funny_chars = 1; - break; - - case LS_LONG_FORMAT: - /* This is for the `vdir' program. */ - format = long_format; - quote_funny_chars = 1; - break; - - case LS_LS: - /* This is for the `ls' program. */ - if (isatty (1)) - { - format = many_per_line; - qmark_funny_chars = 1; - } - else - { - format = one_per_line; - qmark_funny_chars = 0; - } - break; - - default: - abort (); - } - time_type = time_mtime; full_time = 0; @@ -799,5 +796,4 @@ print_block_size = 0; kilobyte_blocks = getenv ("POSIXLY_CORRECT") == 0; - indicator_style = none; print_inode = 0; trace_links = 0; ENDPATCH ./configure --prefix=/usr --disable-nls make * make install * (cd /bin;mv -f dircolors du install mkfifo touch /usr/bin) %%