CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-20 10:51:48 +02:00
Code Issues Projects Releases Wiki Activity

Include posixver.h.

Browse Source 
(usage): Document only the intersection of the old and new behaviors,
to encourage portability.
(shortopts): Remove; no longer needed.
(main): Parse options using POSIX 1003.1-2001 rules if
conforming to that standard.  Do not warn of obsolete options.
This commit is contained in:
Jim Meyering
2002-02-16 08:11:50 +00:00
parent 1e6f7000ac
commit b7bdf635da
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/unexpand.c
View File

@@ -42,8 +42,8 @@
#include <sys/types.h>
#include "system.h"
#include "closeout.h"
#include "error.h"
#include "posixver.h"
/* The official name of this program (e.g., no `g' prefix). */
#define PROGRAM_NAME "unexpand"
@@ -104,12 +104,6 @@ enum
CONVERT_FIRST_ONLY_OPTION = CHAR_MAX + 1
};
static char const shortopts[] = "at:"
#if POSIX2_VERSION < 200112
",0123456789"
#endif
;
static struct option const longopts[] =
{
{"tabs", required_argument, NULL, 't'},
@@ -397,12 +391,7 @@ Mandatory arguments to long options are mandatory for short options too.\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
if (POSIX2_VERSION < 200112)
fputs (_("\
\n\
(obsolete) Instead of -t NUMBER or -t LIST, -NUMBER or -LIST may be used.\n\
"), stdout);
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
puts (_("\nReport bugs to <bug-textutils@gnu.org>."));
}
exit (status == 0 ? EXIT_SUCCESS : EXIT_FAILURE);
}
@@ -432,14 +421,15 @@ main (int argc, char **argv)
tab_list = NULL;
first_free_tab = 0;
while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
while ((c = getopt_long (argc, argv, ",0123456789at:", longopts, NULL))
!= -1)
{
switch (c)
{
case 0:
break;
default:
case '?':
usage (1);
case 'a':
convert_entire_line = 1;
@@ -451,38 +441,28 @@ main (int argc, char **argv)
case CONVERT_FIRST_ONLY_OPTION:
convert_first_only = 1;
break;
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
#if POSIX2_VERSION < 200112
case ',':
add_tabstop (tabval);
tabval = -1;
obsolete_tablist = true;
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
if (tabval == -1)
tabval = 0;
tabval = tabval * 10 + c - '0';
obsolete_tablist = true;
break;
#endif
}
}
if (OBSOLETE_OPTION_WARNINGS && obsolete_tablist)
error (0, 0,
_("warning: `unexpand -TABLIST' is obsolete; use\
`unexpand --first-only -t TABLIST'"));
if (obsolete_tablist && 200112 <= posix2_version ())
{
error (0, 0,
_("`-LIST' option is obsolete; use `--first-only -t LIST'"));
usage (EXIT_FAILURE);
}
if (convert_first_only)
convert_entire_line = 0;