1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
--- getopt-1.1.5/getopt-parse.bash
+++ getopt-1.1.5/getopt-parse.bash
@@ -19,7 +19,7 @@
# Note that we use `"$@"' to let each command-line parameter expand to a
# separate word. The quotes around `$@' are essential!
# We need TEMP as the `eval set --' would nuke the return value of getopt.
-TEMP=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \
+TEMP=`getopt-long -o ab:c:: --long a-long,b-long:,c-long:: \
-n 'example.bash' -- "$@"`
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
--- getopt-1.1.5/getopt-parse.tcsh
+++ getopt-1.1.5/getopt-parse.tcsh
@@ -26,7 +26,7 @@
# as a list. The ':q` copies that list without doing any substitutions:
# each element of argv becomes a separate argument for getopt. The braces
# are needed because the result is also a list.
-set temp=(`getopt -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
+set temp=(`getopt-long -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`)
if ($? != 0) then
echo "Terminating..." >/dev/stderr
exit 1
--- getopt-1.1.5/getopt.c
+++ getopt-1.1.5/getopt.c
@@ -320,10 +320,10 @@
static void __attribute__ ((__noreturn__)) print_help(void)
{
- fputs(_("Usage: getopt optstring parameters\n"), stderr);
- fputs(_(" getopt [options] [--] optstring parameters\n"), stderr);
- fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"), stderr);
- fputs(_(" parameters\n"), stderr);
+ fputs(_("Usage: getopt-long optstring parameters\n"), stderr);
+ fputs(_(" getopt-long [options] [--] optstring parameters\n"), stderr);
+ fputs(_(" getopt-long [options] -o|--options optstring [options] [--]\n"), stderr);
+ fputs(_(" parameters\n"), stderr);
fputs(_("\nOptions:\n"), stderr);
fputs(_(" -a, --alternative Allow long options starting with single -\n"), stderr);
fputs(_(" -h, --help This small usage guide\n"), stderr);
@@ -333,7 +333,7 @@
fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr);
fputs(_(" -Q, --quiet-output No normal output\n"), stderr);
fputs(_(" -s, --shell <shell> Set shell quoting conventions\n"), stderr);
- fputs(_(" -T, --test Test for getopt(1) version\n"), stderr);
+ fputs(_(" -T, --test Test for getopt-long(1) version\n"), stderr);
fputs(_(" -u, --unquote Do not quote the output\n"), stderr);
fputs(_(" -V, --version Output version information\n"), stderr);
fputc('\n', stderr);
--- getopt-1.1.5/Makefile
+++ getopt-1.1.5/Makefile
@@ -32,7 +32,7 @@
LANGUAGES = ca cs da de es et eu fi fr gl hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW
MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\" -Dprogram_version=\"$(VERSION)\"
+CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)-long\" -Dprogram_version=\"$(VERSION)\"
ifeq ($(LIBCGETOPT),0)
CPPFLAGS+=-I./gnu
endif
@@ -81,7 +81,7 @@
for lang in $(LANGUAGES) ; do \
dir=$(localedir)/$$lang/LC_MESSAGES; \
$(INSTALL) -m 755 -d $(DESTDIR)$$dir ;\
- $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt.mo ;\
+ $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt-long.mo ;\
done
clean_po:
$(RM) $(MOFILES)
--- getopt-1.1.5/nls.h
+++ getopt-1.1.5/nls.h
@@ -29,7 +29,7 @@
#ifndef GETOPT_NLS
#define GETOPT_NLS
-#define PACKAGE "getopt"
+#define PACKAGE "getopt-long"
#if WITHOUT_GETTEXT
#define _(Text) (Text)
|
GitWeb