From f5da03589e6e94588b100b02b73ae47ddf5a57ea Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 26 Oct 1993 01:19:12 +0000 Subject: merge with 1.8i --- old/textutils/ChangeLog | 13 +++++++++++++ src/sort.c | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/old/textutils/ChangeLog b/old/textutils/ChangeLog index c8f2794ee..9c752f542 100644 --- a/old/textutils/ChangeLog +++ b/old/textutils/ChangeLog @@ -1,5 +1,18 @@ +Mon Oct 25 20:16:33 1993 Jim Meyering (meyering@comco.com) + + * sort.c: Accept but ignore -y0 for compatibility with Solaris 2. + From Chuck Hedrick (hedrick@klinzhai.rutgers.edu). + + * sort.c (main): Handle --help and --version options. + * Makefile.in (sort.o): Depend on long-options.h. + Sun Oct 24 00:31:02 1993 Jim Meyering (meyering@comco.com) + * csplit.c, cut.c, expand.c, fold.c, head.c, nl.c, od.c, paste.c, + split.c, tac.c, tail.c, unexpand.c, uniq.c: Use the preferred + `--longopt=arg' syntax in --help message rather than `--longopt arg'. + From Francois Pinard. + * tail.c: Don't include . It hasn't been necessary since the Dec 12, 1992 change. diff --git a/src/sort.c b/src/sort.c index ce3d271c1..74d4b466f 100644 --- a/src/sort.c +++ b/src/sort.c @@ -37,6 +37,8 @@ #include #include #include "system.h" +#include "long-options.h" + #ifdef _POSIX_VERSION #include #else @@ -1458,6 +1460,9 @@ main (argc, argv) #endif /* _POSIX_VERSION */ program_name = argv[0]; + + parse_long_options (argc, argv, usage); + have_read_stdin = 0; inittables (); @@ -1673,6 +1678,10 @@ main (argc, argv) case 'u': unique = 1; break; + case 'y': + /* Accept and ignore e.g. -y0 for compatibility with + Solaris 2. */ + goto outer; default: fprintf (stderr, "%s: unrecognized option `-%c'\n", argv[0], *s); -- cgit v1.2.3-70-g09d2