diff options
author | raf <none@none> | 2008-06-06 14:02:15 -0700 |
---|---|---|
committer | raf <none@none> | 2008-06-06 14:02:15 -0700 |
commit | 7257d1b4d25bfac0c802847390e98a464fd787ac (patch) | |
tree | c73fc17df920bc2ca9438c25fea3529890296afd /usr/src/lib/libc/port/regex/glob.c | |
parent | 455903679f53d12d92035adc60bc7c3d95e6b6a2 (diff) | |
download | illumos-gate-7257d1b4d25bfac0c802847390e98a464fd787ac.tar.gz |
PSARC 2008/309 expunge synonyms.h
6700179 expunge synonyms.h
--HG--
rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h
rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c
rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h
rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h
rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h
rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c
rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c
rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c
rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c
rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c
rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c
rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h
rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c
rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c
rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg
rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h
rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h
rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h
rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh
rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c
rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c
Diffstat (limited to 'usr/src/lib/libc/port/regex/glob.c')
-rw-r--r-- | usr/src/lib/libc/port/regex/glob.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/usr/src/lib/libc/port/regex/glob.c b/usr/src/lib/libc/port/regex/glob.c index 24367d797d..c557b6f44d 100644 --- a/usr/src/lib/libc/port/regex/glob.c +++ b/usr/src/lib/libc/port/regex/glob.c @@ -20,12 +20,10 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * This code is MKS code ported to Solaris originally with minimum * modifications so that upgrades from MKS would readily integrate. @@ -45,10 +43,12 @@ * Written by Eric Gisin. */ -#pragma weak glob = _glob -#pragma weak globfree = _globfree +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma weak _glob = glob +#pragma weak _globfree = globfree -#include "synonyms.h" +#include "lint.h" #include <stdio.h> #include <unistd.h> #include <limits.h> @@ -136,7 +136,7 @@ glob(const char *pattern, int flags, i = gp->gl_pathc - ipathc; if (i >= 1 && !(flags & GLOB_NOSORT)) { qsort((char *)(gp->gl_pathp+ipathc), i, sizeof (char *), - pstrcmp); + pstrcmp); } if (i == 0) { if (flags & GLOB_NOCHECK) @@ -232,7 +232,7 @@ globit(size_t dend, const char *sp, glob_t *gp, int flags, /* expand path to max. expansion */ n = dp - *path; *path = realloc(*path, - strlen(*path) + NAME_MAX + strlen(sp) + 1); + strlen(*path) + NAME_MAX + strlen(sp) + 1); if (*path == NULL) { (void) closedir(dirp); free(pat); @@ -290,7 +290,7 @@ append(glob_t *gp, const char *str) if ((gp->gl_pathc + gp->gl_offs) >= gp->gl_pathn) { gp->gl_pathn *= 2; gp->gl_pathv = (char **)realloc((void *)gp->gl_pathv, - gp->gl_pathn * sizeof (char *)); + gp->gl_pathn * sizeof (char *)); if (gp->gl_pathv == NULLCPP) return (GLOB_NOSPACE); gp->gl_pathp = gp->gl_pathv + gp->gl_offs; |