From 7c713e287e50dc338779ed1a6c6ac701720a3a41 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 9 May 1996 00:37:21 +0000 Subject: Wed May 8 20:04:29 1996 Roland McGrath * Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir). [! libc.so-version]: Clear static-only-routines. ($(common-objpfx)sor-$(subdir)): New target. [static-only-routines]: New static pattern rule for these .so's. * Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed. [libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so): New targets replace it. (install) [libc.so-version]: Depend on $(libdir)/libc.so instead of $(slibdir)/libc.so. * io/Makefile (static-only-routines): New variable. * configure.in: Check for tools objdump and objcopy, and for awk. * config.make.in (OBJDUMP, OBJCOPY, AWK): New variables. Thu May 9 01:24:00 1996 Ulrich Drepper * locale/programs/config.h: Remove definition of wint_t. * locale/programs/ld-collate.c: Include instead of . * manual/time.texi: Add some more description for %U and %W format of strftime. Describe new format %V of strftime. * resolv/gethnamaddr.c: Prevent warning by preventing variable definition. * stdio-common/_itoa.c: Ditto. Tue May 7 23:43:07 1996 Ulrich Drepper * libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c, libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c, libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c, libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c, libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c, libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c, libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c, libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c, stdio-common/vfscanf.c: Prepare for reentrent libio. * libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c, libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c, libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files. Used in reentrent libio. * misc/getusershell.c: Prevent warnings. --- misc/getusershell.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'misc/getusershell.c') diff --git a/misc/getusershell.c b/misc/getusershell.c index 6782c3e..3816e1e 100644 --- a/misc/getusershell.c +++ b/misc/getusershell.c @@ -49,9 +49,9 @@ static char sccsid[] = "@(#)getusershell.c 8.1 (Berkeley) 6/4/93"; * /etc/shells. */ -static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; -static char **curshell, **shells, *strings; -static char **initshells __P((void)); +static const char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; +static const char **curshell, **shells, *strings; +static const char **initshells __P((void)); /* * Get a list of shells from _PATH_SHELLS, if it exists. @@ -59,14 +59,14 @@ static char **initshells __P((void)); char * getusershell() { - char *ret; + const char *ret; if (curshell == NULL) curshell = initshells(); ret = *curshell; if (ret != NULL) curshell++; - return (ret); + return (char *) ret; /* Cast away `const' for history reasons. */ } void @@ -89,7 +89,7 @@ setusershell() curshell = initshells(); } -static char ** +static const char ** initshells() { register char **sp, *cp; @@ -97,10 +97,10 @@ initshells() struct stat statb; if (shells != NULL) - free(shells); + free((char *) shells); shells = NULL; if (strings != NULL) - free(strings); + free((char *) strings); strings = NULL; if ((fp = fopen(_PATH_SHELLS, "r")) == NULL) return (okshells); @@ -119,8 +119,8 @@ initshells() strings = NULL; return (okshells); } - sp = shells; - cp = strings; + sp = (char *) shells; + cp = (char *) strings; while (fgets(cp, statb.st_size - (cp - strings), fp) != NULL) { while (*cp != '#' && *cp != '/' && *cp != '\0') cp++; -- cgit v1.1