aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-09-09 22:15:27 -0700
committerUlrich Drepper <drepper@redhat.com>2009-09-09 22:15:27 -0700
commit02bf610ca82f4b5660dadcfff04124e73f8ef2ff (patch)
treee8a0318ac85b0f42b7868ff25878b36b77646f87
parent0549ce8ec1f66a41c59815e50dd48ffd74fabb52 (diff)
downloadglibc-02bf610ca82f4b5660dadcfff04124e73f8ef2ff.tar
glibc-02bf610ca82f4b5660dadcfff04124e73f8ef2ff.tar.gz
glibc-02bf610ca82f4b5660dadcfff04124e73f8ef2ff.tar.bz2
glibc-02bf610ca82f4b5660dadcfff04124e73f8ef2ff.zip
Handle -- on getconf command line.
-rw-r--r--ChangeLog4
-rw-r--r--posix/getconf.c72
2 files changed, 42 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 16c976f182..3dd4dc0d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-09 Ulrich Drepper <drepper@redhat.com>
+
+ * posix/getconf.c (main): Handle -- on command line.
+
2009-09-05 H.J. Lu <hongjiu.lu@intel.com>
* configure.in: Support binutils 2.100 and 3.0.
diff --git a/posix/getconf.c b/posix/getconf.c
index facf5b08f5..d9d90e44f7 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -1052,34 +1052,34 @@ print_all (const char *path)
printf("%-35s", c->name);
switch (c->call) {
case PATHCONF:
- value = pathconf (path, c->call_name);
- if (value != -1) {
- printf("%ld", value);
- }
- printf("\n");
- break;
+ value = pathconf (path, c->call_name);
+ if (value != -1) {
+ printf("%ld", value);
+ }
+ printf("\n");
+ break;
case SYSCONF:
- value = sysconf (c->call_name);
- if (value == -1l) {
- if (c->call_name == _SC_UINT_MAX
- || c->call_name == _SC_ULONG_MAX)
- printf ("%lu", value);
- }
- else {
- printf ("%ld", value);
- }
- printf ("\n");
- break;
+ value = sysconf (c->call_name);
+ if (value == -1l) {
+ if (c->call_name == _SC_UINT_MAX
+ || c->call_name == _SC_ULONG_MAX)
+ printf ("%lu", value);
+ }
+ else {
+ printf ("%ld", value);
+ }
+ printf ("\n");
+ break;
case CONFSTR:
- clen = confstr (c->call_name, (char *) NULL, 0);
- cvalue = (char *) malloc (clen);
- if (cvalue == NULL)
- error (3, 0, _("memory exhausted"));
- if (confstr (c->call_name, cvalue, clen) != clen)
- error (3, errno, "confstr");
- printf ("%.*s\n", (int) clen, cvalue);
+ clen = confstr (c->call_name, (char *) NULL, 0);
+ cvalue = (char *) malloc (clen);
+ if (cvalue == NULL)
+ error (3, 0, _("memory exhausted"));
+ if (confstr (c->call_name, cvalue, clen) != clen)
+ error (3, errno, "confstr");
+ printf ("%.*s\n", (int) clen, cvalue);
free (cvalue);
- break;
+ break;
}
}
exit (0);
@@ -1239,13 +1239,17 @@ environment SPEC.\n\n"));
usage ();
}
- if (argc < 2 || argc > 3)
+ int ai = 1;
+ if (argc > ai && strcmp (argv[ai], "--") == 0)
+ ++ai;
+
+ if (argc - ai < 1 || argc - ai > 2)
usage ();
for (c = vars; c->name != NULL; ++c)
- if (strcmp (c->name, argv[1]) == 0
+ if (strcmp (c->name, argv[ai]) == 0
|| (strncmp (c->name, "_POSIX_", 7) == 0
- && strcmp (c->name + 7, argv[1]) == 0))
+ && strcmp (c->name + 7, argv[ai]) == 0))
{
long int value;
size_t clen;
@@ -1253,14 +1257,14 @@ environment SPEC.\n\n"));
switch (c->call)
{
case PATHCONF:
- if (argc < 3)
+ if (argc - ai < 2)
usage ();
errno = 0;
- value = pathconf (argv[2], c->call_name);
+ value = pathconf (argv[ai + 1], c->call_name);
if (value == -1)
{
if (errno)
- error (3, errno, "pathconf: %s", argv[2]);
+ error (3, errno, "pathconf: %s", argv[ai + 1]);
else
puts (_("undefined"));
}
@@ -1269,7 +1273,7 @@ environment SPEC.\n\n"));
exit (0);
case SYSCONF:
- if (argc > 2)
+ if (argc - ai > 1)
usage ();
value = sysconf (c->call_name);
if (value == -1l)
@@ -1285,7 +1289,7 @@ environment SPEC.\n\n"));
exit (0);
case CONFSTR:
- if (argc > 2)
+ if (argc - ai > 1)
usage ();
clen = confstr (c->call_name, (char *) NULL, 0);
cvalue = (char *) malloc (clen);
@@ -1300,7 +1304,7 @@ environment SPEC.\n\n"));
}
}
- error (2, 0, _("Unrecognized variable `%s'"), argv[1]);
+ error (2, 0, _("Unrecognized variable `%s'"), argv[ai]);
/* NOTREACHED */
return 2;
}