aboutsummaryrefslogtreecommitdiff
path: root/posix/getconf.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-26 04:35:31 +0000
committerRoland McGrath <roland@gnu.org>1996-07-26 04:35:31 +0000
commit036cc82fbc47a632c1ed3a310a1a29365fe48d3d (patch)
tree3822092b5e9f64de600329bca9d6b0a0bbadf0eb /posix/getconf.c
parent1e16111cf1abdcc2d6a617e7ba48a80ce1556797 (diff)
downloadglibc-036cc82fbc47a632c1ed3a310a1a29365fe48d3d.zip
glibc-036cc82fbc47a632c1ed3a310a1a29365fe48d3d.tar.gz
glibc-036cc82fbc47a632c1ed3a310a1a29365fe48d3d.tar.bz2
Fri Jul 26 04:41:28 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/libintl.h: Define optimizing macros if __OPTIMIZE__ is defined, not __OPTIMIZED. (_nl_msg_cat_cntr): Move declaration outside macro definition to prevent "nested extern" warning. (dcgettext): Rename local variable `result' to `__result'. Thu Jul 25 22:46:30 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * locale/programs/localedef.c (__progname): Remove decl. (main): Use program_invocation_short_name instead of __progname. (usage): Use program_invocation_name instead of __progname. Fri Jul 26 03:46:08 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c: Use "libc" instead of PACKAGE. * locale/localedef.c: Ditto. * locale/locale.c: Ditto. * locale/findlocale.c (_nl_find_locale): Little optimization. Use new function `strndup'. * locale/loadlocale.c: Little optimization. Use constant value from `_nl_category_num_items' instead of byte-order dependend value from file. * locale/programs/ld-time.c (time_add): Correct string constant. * locale/programs/locale-spec.c: New file. * locale/programs/locale.c: Call `locale_special' function if no other field matches. * locale/programs/localedef.c: No need to define `program_name'. Use global variable `__progname'. * locale/programs/locfile.c (write_locale_data): Always write LC_MESSAGES data in LC_MESSAGES/SYS_LC_MESSAGES file. This is necessary since message catalogs are also installed in the LC_MESSAGES/ directory. * locale/programs/stringtrans.c (ADDC): Correctly use `encode_char' function instead of writing single bytes. (encode_char): Also handle little endian. * locale/setlocale.c (new_composite_name): Little optimization. Use return value of `memcpy'. * misc/ttyent.h: Pretty print prototypes, add missing parameter names, prepend parameter names with __ and use `__const' instead of `const'. * posix/unistd.h: Ditto. * stdlib/stdlib.h: Ditto. * string/string.h: Ditto. * posix/getconf.c: De-ASNI-fy. Recognize POSIX.2 constant names. Use `error' function instead of doing it by hand. * sysdeps/posix/sysconf.c: De-ANSI-fy. Handle _SC_COLL_WEIGHTS_MAX. * sysdeps/stub/sysconf.c: Handle _SC_CHARCLASS_NAME_MAX, _SC_COLL_WEIGHTS_MAX, _SC_EQUIV_CLASS_MAX, _SC_2_LOCALEDEF since these do depend on the platform. Add POSIX.4 symbols. * posix/posix2_lim.h: Add missing definition of _POSIX2_COLL_WEIGHTS_MAX. Change _POSIX2_EQUIV_CLASS_MAX and _POSIX2_CHARCLASS_NAME_MAX to high values since we have no fixed limit. * sysdeps/generic/confname.h: Add _SC_PAGE_SIZE as alias for _SC_PAGESIZE for buggy systems (= HP UX) out there. * wcsmbs/Makefile (routines): Add mbsnrtowcs and wcsnrtombs. * wcsmbs/mbsnrtowcs.c: New file. Non-standard implementation. * wcsmbs/wcsnrtombs.c: Ditto. * wcsmbs/wchar.h [__USE_GNU]: Add prototypes for mbsnrtowcs and wcsnrtombs. Thu Jul 25 00:25:54 Richard Henderson <rth@tamu.edu> * nss/nss_db/db-XXX.c: Kill trailing ; from lock defn as a matter of course. * nss/getXXent_r.c: Likewise. * nss/nsswitch.c: Likewise. * nss/nss_files/files-XXX.c: Likewise. * sysdeps/mach/hurd/dirstream.h (struct __dirstream): Likewise. * sysdeps/unix/bsd/telldir.c (struct record): Likewise. * sysdeps/unix/dirstream.h (struct __dirstream): Likewise.
Diffstat (limited to 'posix/getconf.c')
-rw-r--r--posix/getconf.c69
1 files changed, 37 insertions, 32 deletions
diff --git a/posix/getconf.c b/posix/getconf.c
index 699cf67..6d78205 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -16,18 +16,19 @@ License along with the GNU C Library; see the file COPYING.LIB. If
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
Cambridge, MA 02139, USA. */
-#include <ansidecl.h>
#include <unistd.h>
#include <errno.h>
+#include <error.h>
+#include <libintl.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
struct conf
{
- CONST char *name;
- CONST int call_name;
- CONST enum { SYSCONF, CONFSTR, PATHCONF } call;
+ const char *name;
+ const int call_name;
+ const enum { SYSCONF, CONFSTR, PATHCONF } call;
};
static struct conf vars[] =
@@ -82,31 +83,43 @@ static struct conf vars[] =
{ "_POSIX_PII_OSI_CLTS", _SC_PII_OSI_CLTS, SYSCONF },
{ "_POSIX_PII_OSI_M", _SC_PII_OSI_M, SYSCONF },
{ "_T_IOV_MAX", _SC_T_IOV_MAX, SYSCONF },
+ /* POSIX.2 */
+ { "BC_BASE_MAX", _SC_BC_BASE_MAX, SYSCONF },
+ { "BC_DIM_MAX", _SC_BC_DIM_MAX, SYSCONF },
+ { "BC_SCALE_MAX", _SC_BC_SCALE_MAX, SYSCONF },
+ { "BC_STRING_MAX", _SC_BC_STRING_MAX, SYSCONF },
+ { "COLL_WEIGHTS_MAX", _SC_COLL_WEIGHTS_MAX, SYSCONF },
+ { "EQUIV_CLASS_MAX", _SC_EQUIV_CLASS_MAX, SYSCONF },
+ { "EXPR_NEST_MAX", _SC_EXPR_NEST_MAX, SYSCONF },
+ { "LINE_MAX", _SC_LINE_MAX, SYSCONF },
+ { "RE_DUP_MAX", _SC_RE_DUP_MAX, SYSCONF },
+ { "CHARCLASS_NAME_MAX", _SC_CHARCLASS_NAME_MAX },
+ { "POSIX2_C_BIND", _SC_2_C_BIND, SYSCONF },
+ { "POSIX2_C_DEV", _SC_2_C_DEV, SYSCONF },
+ { "POSIX2_FORT_DEV", _SC_2_FORT_DEV, SYSCONF },
+ { "POSIX2_FORT_RUN", _SC_2_FORT_RUN, SYSCONF },
+ { "POSIX2_LOCALEDEF", _SC_2_LOCALEDEF, SYSCONF },
+ { "POSIX2_SW_DEV", _SC_2_SW_DEV, SYSCONF },
{ "PATH", _CS_PATH, CONFSTR },
{ NULL, 0, SYSCONF }
};
-static CONST char *program;
+extern const char *__progname;
+
static void
-DEFUN_VOID(usage)
+usage (void)
{
- fprintf (stderr, _("Usage: %s variable_name [pathname]\n"), program);
+ fprintf (stderr, _("Usage: %s variable_name [pathname]\n"), __progname);
exit (2);
}
int
-DEFUN(main, (argc, argv), int argc AND char **argv)
+main (int argc, char *argv[])
{
- register CONST struct conf *c;
-
- program = strrchr (argv[0], '/');
- if (program == NULL)
- program = argv[0];
- else
- ++program;
+ register const struct conf *c;
if (argc < 2 || argc > 3)
usage ();
@@ -124,11 +137,8 @@ DEFUN(main, (argc, argv), int argc AND char **argv)
usage ();
value = pathconf (argv[2], c->call_name);
if (value == -1)
- {
- fprintf (stderr, "%s: pathconf: %s: %s\n",
- program, argv[2], strerror (errno));
- exit (3);
- }
+ error (3, errno, "pathconf: %s", argv[2]);
+
printf ("%ld\n", value);
exit (0);
@@ -145,22 +155,17 @@ DEFUN(main, (argc, argv), int argc AND char **argv)
clen = confstr (c->call_name, (char *) NULL, 0);
cvalue = (char *) malloc (clen);
if (cvalue == NULL)
- {
- fprintf (stderr, "%s: malloc: %s\n",
- program, strerror (errno));
- exit (3);
- }
+ error (3, 0, _("memory exhausted"));
+
if (confstr (c->call_name, cvalue, clen) != clen)
- {
- fprintf (stderr, "%s: confstr: %s\n",
- program, strerror (errno));
- exit (3);
- }
+ error (3, errno, "confstr");
+
printf ("%.*s\n", (int) clen, cvalue);
exit (0);
}
}
- fprintf (stderr, _("%s: Unrecognized variable `%s'\n"), program, argv[1]);
- exit (2);
+ error (2, 0, _("Unrecognized variable `%s'"), argv[1]);
+ /* NOTREACHED */
+ return 2;
}