AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 08:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Makerules (versioned): Strip whitespace.

Browse Source 
* Rules (static-only-routines rule): Remove spurious space in dep.

	* misc/getusershell.c: Undo changes of 7 May 96 (rev 1.6).
	Cast string constants to char *.

	* posix/glob/SMakefile, posix/glob/SCOPTIONS, posix/glob/Makefile.ami:
	New files, AmigaDOS support from Aaron Digulla.
	* posix/Makefile (glob.tar): Add AmigaDOS support files.
This commit is contained in:
Roland McGrath 1996-05-09 19:30:57 +00:00
parent 3e2632b62d
commit 05d4c98219
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,16 @@
Thu May 9 09:17:46 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> Thu May 9 09:17:46 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Makerules (versioned): Strip whitespace.
* Rules (static-only-routines rule): Remove spurious space in dep.
* misc/getusershell.c: Undo changes of 7 May 96 (rev 1.6).
Cast string constants to char *.
* posix/glob/SMakefile, posix/glob/SCOPTIONS, posix/glob/Makefile.ami:
New files, AmigaDOS support from Aaron Digulla.
* posix/Makefile (glob.tar): Add AmigaDOS support files.
* sysdeps/unix/sysv/linux/net/if.h: New file. * sysdeps/unix/sysv/linux/net/if.h: New file.
* sysdeps/unix/sysv/linux/Dist: Add it. * sysdeps/unix/sysv/linux/Dist: Add it.
* sysdeps/unix/sysv/linux/Makefile [$(subdir)=socket] (headers): Add * sysdeps/unix/sysv/linux/Makefile [$(subdir)=socket] (headers): Add

4
Makerules
View File

@ -552,8 +552,8 @@ ifeq (yes,$(build-shared))
install-lib-nosubdir: $(install-lib.so:%=$(libdir)/%) install-lib-nosubdir: $(install-lib.so:%=$(libdir)/%)
# Find which .so's have versions. # Find which .so's have versions.
versioned := $(foreach so,$(install-lib.so),\ versioned := $(strip $(foreach so,$(install-lib.so),\
$(patsubst %,$(so),$($(so)-version))) $(patsubst %,$(so),$($(so)-version))))
# Install all the unversioned shared libraries. # Install all the unversioned shared libraries.
$(addprefix $(libdir)/,$(filter-out $(versioned),$(install-lib.so))): \ $(addprefix $(libdir)/,$(filter-out $(versioned),$(install-lib.so))): \

2
Rules
View File

@ -149,7 +149,7 @@ $(common-objpfx)sor-$(subdir): Makefile
ifdef static-only-routines ifdef static-only-routines
# These routines are to be omitted from the shared library object, # These routines are to be omitted from the shared library object,
# so we replace the PIC objects for them with the empty object file. # so we replace the PIC objects for them with the empty object file.
$(static-only-routines:%=$(objpfx)%.so): %.so: $(common-objpfx) empty.o $(static-only-routines:%=$(objpfx)%.so): %.so: $(objpfx)empty.o
rm -f $@ rm -f $@
ln $< $@ ln $< $@
endif endif

21
misc/getusershell.c
View File

@ -49,9 +49,10 @@ static char sccsid[] = "@(#)getusershell.c 8.1 (Berkeley) 6/4/93";
* /etc/shells. * /etc/shells.
*/ */
static const char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL }; static char *okshells[] = { (char *) _PATH_BSHELL, (char *) _PATH_CSHELL,
static const char **curshell, **shells, *strings; NULL };
static const char **initshells __P((void)); static char **curshell, **shells, *strings;
static char **initshells __P((void));
/* /*
* Get a list of shells from _PATH_SHELLS, if it exists. * Get a list of shells from _PATH_SHELLS, if it exists.
@ -59,14 +60,14 @@ static const char **initshells __P((void));
char * char *
getusershell() getusershell()
{ {
const char *ret; char *ret;
if (curshell == NULL) if (curshell == NULL)
curshell = initshells(); curshell = initshells();
ret = *curshell; ret = *curshell;
if (ret != NULL) if (ret != NULL)
curshell++; curshell++;
return (char *) ret; /* Cast away `const' for history reasons. */ return (ret);
} }
void void
@ -89,7 +90,7 @@ setusershell()
curshell = initshells(); curshell = initshells();
} }
static const char ** static char **
initshells() initshells()
{ {
register char **sp, *cp; register char **sp, *cp;
@ -97,10 +98,10 @@ initshells()
struct stat statb; struct stat statb;
if (shells != NULL) if (shells != NULL)
free((char *) shells); free(shells);
shells = NULL; shells = NULL;
if (strings != NULL) if (strings != NULL)
free((char *) strings); free(strings);
strings = NULL; strings = NULL;
if ((fp = fopen(_PATH_SHELLS, "r")) == NULL) if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
return (okshells); return (okshells);
@ -119,8 +120,8 @@ initshells()
strings = NULL; strings = NULL;
return (okshells); return (okshells);
} }
sp = (char *) shells; sp = shells;
cp = (char *) strings; cp = strings;
while (fgets(cp, statb.st_size - (cp - strings), fp) != NULL) { while (fgets(cp, statb.st_size - (cp - strings), fp) != NULL) {
while (*cp != '#' && *cp != '/' && *cp != '\0') while (*cp != '#' && *cp != '/' && *cp != '\0')
cp++; cp++;