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
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
Index: getopt-1.1.4/getopt.c
===================================================================
--- getopt-1.1.4.orig/getopt.c
+++ getopt-1.1.4/getopt.c
@@ -88,7 +88,7 @@ void *our_malloc(size_t size)
{
void *ret=malloc(size);
if (! ret) {
- fprintf(stderr,_("%s: Out of memory!\n"),"getopt");
+ fprintf(stderr,_("%s: Out of memory!\n"),"getopt-long");
exit(3);
}
return(ret);
@@ -98,7 +98,7 @@ void *our_realloc(void *ptr, size_t size
{
void *ret=realloc(ptr,size);
if (! ret && size) {
- fprintf(stderr,_("%s: Out of memory!\n"),"getopt");
+ fprintf(stderr,_("%s: Out of memory!\n"),"getopt-long");
exit(3);
}
return(ret);
@@ -231,8 +231,8 @@ int generate_output(char * argv[],int ar
void parse_error(const char *message)
{
if (message)
- fprintf(stderr,"getopt: %s\n",message);
- fputs(_("Try `getopt --help' for more information.\n"),stderr);
+ fprintf(stderr,"getopt-long: %s\n",message);
+ fputs(_("Try `getopt-long --help' for more information.\n"),stderr);
exit(2);
}
@@ -323,10 +323,10 @@ void set_shell(const char *new_shell)
void 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(_(" -a, --alternative Allow long options starting with single -\n"),stderr);
fputs(_(" -h, --help This small usage guide\n"),stderr);
fputs(_(" -l, --longoptions=longopts Long options to be recognized\n"),stderr);
@@ -335,7 +335,7 @@ void print_help(void)
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, --unqote Do not quote the output\n"),stderr);
fputs(_(" -V, --version Output version information\n"),stderr);
exit(2);
@@ -443,7 +443,7 @@ int main(int argc, char *argv[])
quote=0;
break;
case 'V':
- printf(_("getopt (enhanced) 1.1.4\n"));
+ printf(_("getopt-long (enhanced) 1.1.4\n"));
exit(0);
case '?':
case ':':
Index: getopt-1.1.4/getopt-parse.bash
===================================================================
--- getopt-1.1.4.orig/getopt-parse.bash
+++ getopt-1.1.4/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
Index: getopt-1.1.4/getopt-parse.tcsh
===================================================================
--- getopt-1.1.4.orig/getopt-parse.tcsh
+++ getopt-1.1.4/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
Index: getopt-1.1.4/Makefile
===================================================================
--- getopt-1.1.4.orig/Makefile
+++ getopt-1.1.4/Makefile
@@ -85,7 +85,7 @@ install_po: all_po
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)
Index: getopt-1.1.4/nls.h
===================================================================
--- getopt-1.1.4.orig/nls.h
+++ getopt-1.1.4/nls.h
@@ -29,7 +29,7 @@
#ifndef GETOPT_NLS
#define GETOPT_NLS
-#define PACKAGE "getopt"
+#define PACKAGE "getopt-long"
#ifndef WITHOUT_GETTEXT
#include <libintl.h>
|
