c40298232a
Mon Sep 23 15:31:04 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/Makefile ($(includedir)/rpc/netdb.h): There is no make variable `top_srcdir' in libc; use $(..) instead. * sysdeps/mach/hurd/Makefile (rtld-installed-name): Delete special definition. It was a *Mistake*. (With a capital M.) * sysdeps/mach/getsysstats.c (__get_nprocs): Renamed from __get_nproc. (__get_nprocs_conf): Renamed from __get_nproc_conf. Fri Sep 27 03:49:56 1996 Ulrich Drepper <drepper@cygnus.com> Add support for cancelable system calls. * csu/initfini.c: Make in crti.o reference to symbol __libc_force_cancel_wrapper when compiling reentrant version. * misc/Makefile (routines): Add force-wrapper. * misc/force-wrapper.c: New file. * posix/system.c: Rename function to __libc_system and make system a weak alias. * sysdeps/stub/system.c: Likewise. * posix/wait.c: Rename function to __libc_wait and make __wait a weak alias. De-ANSI-fy. * sysdeps/standalone/read.c: Rename function to __libc_read and make __read a weak alias. * sysdeps/stub/read.c: Likewise. * sysdeps/standalone/write.c: Rename function to __libc_write and make __write a weak alias. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/tcdrain.c: Rename function to __libc_tcdrain and make tcdrain a weak alias. * sysdeps/unix/bsd/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/tcdrain.c: Likewise. * sysdeps/unix/sysv/tcdrain.c: Likewise. * sysdeps/unix/sysv/linux/tcdrain.c: Likewise. * sysdeps/unix/bsd/bsd4.4/wait.c: Rename function to __libc_wait and make __wait a weak alias. * sysdeps/stub/waitpid.c: Rename function to __libc_waitpid and make __waitpid a weak alias. * sysdeps/unix/bsd/bsd4.4/waitpid.c: Likewise. * sysdeps/unix/sysv/linux/waitpid.c: Likewise. * sysdeps/unix/sysv/sysv4/waitpid.c: Likewise. * sysdeps/unix/common/pause.c: Rename function to __libc_pause and make pause a weak alias. De-ANSI-fy. * sysdeps/unix/syscalls.list: Change name for close, fcntl, fsync, lseek, open, read, and write to have __libc_ prefix and make old names a weak alias. * sysdeps/unix/mman/syscalls.list: Likewise for msync. * sysdeps/unix/sysv/linux/syscalls.list: Likewise for nanosleep. * io/creat.c: De-ANSI-fy. * sysdeps/unix/sysv/linux/syscalls.list: Add pause. Thu Sep 26 19:15:55 1996 Ulrich Drepper <drepper@cygnus.com> * misc/mntent.h: Add MNTTYPE_* and MNTOPT_* macros. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. Thu Sep 26 14:40:10 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/pathconf.c: Pass descriptor for just opened file to fpathconf. Reported by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>. Thu Sep 26 04:02:43 1996 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locfile.c (write_locale_data): Allocate room even for file name for LC_MESSAGES locale. (locafile_read): `tok_era' must be handled as a string list. * locale/programs/ld-time.c: Finish correction of handling `era'. * locale/C-time.c (_nl_C_LC_TIME): Add initializer for new fields. * locale/categories.def: Add postload function for LC_TIME. * locale/setlocale.c: Make lock global and rename to __libc_setlocale_lock. * locale/localeinfo.h (struct era_entry): New type. Used in strftime. Add prototypes for _nl_get_era_entry and _nl_get_alt_digit. * locale/lc-time.c (_nl_postload_time): New function. Initialize lazy intialization. (_nl_get_era_entry): New function. Return era entry which corresponds to given year. (_nl_get_alt_digit): New function. Return string with alternate digit representation for given number. * time/strftime.c (strftime): Use _nl_get_alt_digit to get string representing alternate digit notation. Wed Sep 25 17:31:55 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/waitstatus.h (union wait): Add w_status field. Reported by Hans Grobler <grobh@nolian.ee.sun.ac.za>. * elf/rtld.c (dl_main): Process LD_PRELOAD before loading ld.so.preload. Suggested by David Engel <david@elo.ods.com>. Wed Sep 25 13:10:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Change --version again because RMS wants the package name in parentheses. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. Tue Sep 24 01:28:05 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile ($(objpfx)sysd-dirs): Depend on Subdirs files, command rewritten. ($(objpfx)version-info.h): Depend on Banner files, command rewritten. Wed Sep 25 02:44:41 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/sleep.c: New file. Based on nanosleep. Tue Sep 24 21:46:02 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/lckpwdf.c (PWD_LOCKFILE): Change to /etc/lock.pwd to be on the same device as the password file. * shadow/shadow.h (struct spwd): Change type of numeric fields to `long int' since there value are days, not seconds. * shadow/putspent.c: Change casts from time_t to `long int'. * shadow/sgetspent_r.c (LINE_READER): Likewise. Mon Sep 23 23:05:24 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/errnos.h: Define __set_errno to make sure the thread specific variable is set as well as the global variable. * sysdeps/mach/hurd/errnos.awk: Define macro for source code compatibility. * sysdeps/stub/errnos.h: Likewise. * sysdeps/unix/bsd/bsd4.4/errnos.h: Likewise. * shadow/putspent.c: Don't include <errno.h>. * dirent/scandir.c (scandir): Use __set_errno to set errno variable. * elf/dl-load.c (open_path): Likewise. * inet/rcmd.c (rcmd): Likewise. (rresvport): Likewise. * intl/dcgettext.c [!__set_errno]: Define __set_errno. (DCGETTEXT): Use __set_errno to set errno variable. * io/fts.c (fts_open): Likewise. (fts_close): Likewise. (fts_read): Likewise. (fts_set): Likewise. (fts_children): Likewise. (fts_build): Likewise. (fts_stat): Likewise. * io/ftw.c (ftw_dir): Likewise. (ftw): Likewise. * io/getwd.c (getwd): Likewise. * io/lockf.c (lockf): Likewise. * libio/libioP.h [EINVAL]: Use __set_errno to define MAYBE_SET_EINVAL. * libio/iofdopen.c (_IO_fdopen): Use MAYBE_SET_EINVAL to errno. * libio/iogetdelim.c (_IO_getdelim): Likewise. * libio/fileops.c (_IO_file_open): Use __set_errno to set errno variable. * libio/iofgetpos.c (_IO_fgetpos): Likewise. * libio/iofsetpos.c (_IO_fsetpos): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * locale/nl_langinfo.c (nl_langinfo): Likewise. * locale/setlocale.c (ERROR_RETURN): Likewise. * login/getutid_r (__getutid_r): Likewise. * login/getutline_r (__getutline_r): Likewise. * login/login.c (tty_name): Likewise. * login/oututline_r.c (__pututline_r): Likewise. * malloc/malloc.c (morecore): Likewise. * misc/efgcvt_r.c (fcvt_r): Likewise. * misc/hsearch_r.c (hcreate_r): Likewise. (hdestroy_r): Likewise. (hsearch_r): Likewise. * nss/nsswitch.c (__nss_configure_lookup): Likewise. * nss/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Likewise. (_nss_dns_gethostbyaddr_r): Likewise. * nss/nss_files/files-XXX.c (internal_getent): Likewise. * nss/nss_files/files-parse.c (parse_list): Likewise. * posix/confstr.c (confstr): Likewise. De-ANSI-fy. * posix/execvp.c (execvp): Likewise. * posix/glob.c: Define __set_errno. (glob): Use __set_errno to set errno variable. (glob_in_dir): Likewise. * pwd/getpw.c: Likewise. De-ANSI-fy. * pwd/putpwent.c: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/inet_neta.c: Likewise. * resolv/inet_ntop.c: Likewise. * resolv/inet_pton.c: Likewise. * resolv/res_query.c (res_search): Likewise. * resolv/res_send.c (Aerror): Likewise. (Perror): Likewise. (res_send): Likewise. * signal/sigaddset.c: Likewise. De-ANSI-fy. * signal/sigdelset.c: Likewise. * signal/sigempty.c: Likewise. * signal/sigfillset.c: Likewise. * signal/sigismem.c: Likewise. * stdio/fclose.c: Likewise. * stdio/feof.c: Likewise. * stdio/ferror.c: Likewise. * stdio/fflush.c: Likewise. * stdio/fgetc.c: Likewise. * stdio/fgetpos.c: Likewise. * stdio/fgets.c: Likewise. * stdio/fileno.c: Likewise. * stdio/fmemopen.c: Likewise. * stdio/fopen.c: Likewise. * stdio/fputc.c: Likewise. * stdio/fread.c: Likewise. * stdio/freopen.c: Likewise. * stdio/fseek.c: Likewise. * stdio/fsetpos.c: Likewise. * stdio/ftell.c: Likewise. * stdio/fwrite.c: Likewise. * stdio/getdelim.c: Likewise. * stdio/gets.c: Likewise. * stdio/glue.c: Likewise. * stdio/internals.c: Likewise. * stdio/memstream.c: Likewise. * stdio/setvbuf.c: Likewise. * stdio/ungetc.c: Likewise. * stdio/vsscanf.c: Likewise. * stdio-common/reg-printf.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/canonicalize.c: Likewise. * stdlib/msort.c: Likewise. * stdlib/random_r.c: Likewise. * stdlib/strfmon.c: Likewise. * stdlib/strtod.c: Likewise. * stdlib/strtol.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * time/asctime.c: Likewise. * time/localtime.c: Likewise. * wcsmbs/mbrtowc.c: Likewise. * wcsmbs/mbsnrtowcs.c: Likewise. * wcsmbs/mbsrtowcs.c: Likewise. * wcsmbs/wcrtomb.c: Likewise. * wcsmbs/wcsnrtombs.c: Likewise. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/wcstok.c: Likewise. * sysdeps/generic/ftime.c: Likewise. * sysdeps/generic/pty.c: Likewise. * sysdeps/generic/setenv.c: Likewise. * sysdeps/generic/speed.c: Likewise. * sysdeps/generic/sysd-stdio.c: Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/generic/vlimit.c: Likewise. * sysdeps/libm-ieee754/k_standard.c: Likewise. * sysdeps/libm-ieee754/s_ldexp.c: Likewise. * sysdeps/libm-ieee754/s_ldexpf.c: Likewise. * sysdeps/libm-ieee754/s_ldexpl.c: Likewise. * sysdeps/libm-ieee754/w_scalb.c: Likewise. * sysdeps/libm-ieee754/w_scalbf.c: Likewise. * sysdeps/libm-ieee754/w_scalbl.c: Likewise. * sysdeps/posix/dup2.c: Likewise. * sysdeps/posix/euidaccess.c: Likewise. * sysdeps/posix/fdopen.c: Likewise. * sysdeps/posix/flock.c: Likewise. * sysdeps/posix/fpathconf.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/gettimeofday.c: Likewise. * sysdeps/posix/isatty.c: Likewise. * sysdeps/posix/isfdtype.c: Likewise. * sysdeps/posix/killpg.c: Likewise. * sysdeps/posix/mkstemp.c: Likewise. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/posix/pathconf.c: Likewise. * sysdeps/posix/pipestream.c: Likewise. * sysdeps/posix/remove.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/posix/sigintr.c: Likewise. * sysdeps/posix/signal.c: Likewise. * sysdeps/posix/sigsuspend.c: Likewise. * sysdeps/posix/sigvec.c: Likewise. * sysdeps/posix/sleep.c: Likewise. * sysdeps/posix/sysconf.c: Likewise. * sysdeps/posix/system.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * sysdeps/posix/truncate.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/wait3.c: Likewise. * sysdeps/standalone/close.c: Likewise. * sysdeps/standalone/open.c: Likewise. * sysdeps/standalone/read.c: Likewise. * sysdeps/standalone/write.c: Likewise. * sysdeps/stub/__longjmp.c: Likewise. * sysdeps/stub/accept.c: Likewise. * sysdeps/stub/access.c: Likewise. * sysdeps/stub/acct.c: Likewise. * sysdeps/stub/adjtime.c: Likewise. * sysdeps/stub/alarm.c: Likewise. * sysdeps/stub/bind.c: Likewise. * sysdeps/stub/brk.c: Likewise. * sysdeps/stub/chdir.c: Likewise. * sysdeps/stub/chflags.c: Likewise. * sysdeps/stub/chmod.c: Likewise. * sysdeps/stub/chown.c: Likewise. * sysdeps/stub/chroot.c: Likewise. * sysdeps/stub/clock.c: Likewise. * sysdeps/stub/close.c: Likewise. * sysdeps/stub/closedir.c: Likewise. * sysdeps/stub/connect.c: Likewise. * sysdeps/stub/ctermid.c: Likewise. * sysdeps/stub/cuserid.c: Likewise. * sysdeps/stub/dirfd.c: Likewise. * sysdeps/stub/dup.c: Likewise. * sysdeps/stub/dup2.c: Likewise. * sysdeps/stub/euidaccess.c: Likewise. * sysdeps/stub/execve.c: Likewise. * sysdeps/stub/fchdir.c: Likewise. * sysdeps/stub/fchflags.c: Likewise. * sysdeps/stub/fchmod.c: Likewise. * sysdeps/stub/fchown.c: Likewise. * sysdeps/stub/fcntl.c: Likewise. * sysdeps/stub/fdopen.c: Likewise. * sysdeps/stub/fexecve.c: Likewise. * sysdeps/stub/flock.c: Likewise. * sysdeps/stub/fork.c: Likewise. * sysdeps/stub/fpathconf.c: Likewise. * sysdeps/stub/fstatfs.c: Likewise. * sysdeps/stub/fsync.c: Likewise. * sysdeps/stub/ftruncate.c: Likewise. * sysdeps/stub/fxstat.c: Likewise. * sysdeps/stub/getcwd.c: Likewise. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/getdomain.c: Likewise. * sysdeps/stub/getdtsz.c: Likewise. * sysdeps/stub/getegid.c: Likewise. * sysdeps/stub/getenv.c: Likewise. * sysdeps/stub/geteuid.c: Likewise. * sysdeps/stub/getgid.c: Likewise. * sysdeps/stub/getgroups.c: Likewise. * sysdeps/stub/gethostid.c: Likewise. * sysdeps/stub/gethostname.c: Likewise. * sysdeps/stub/getitimer.c: Likewise. * sysdeps/stub/getlogin.c: Likewise. * sysdeps/stub/getlogin_r.c: Likewise. * sysdeps/stub/getpagesize.c: Likewise. * sysdeps/stub/getpeername.c: Likewise. * sysdeps/stub/getpid.c: Likewise. * sysdeps/stub/getppid.c: Likewise. * sysdeps/stub/getpriority.c: Likewise. * sysdeps/stub/getrlimit.c: Likewise. * sysdeps/stub/getrusage.c: Likewise. * sysdeps/stub/getsid.c: Likewise. * sysdeps/stub/getsockname.c: Likewise. * sysdeps/stub/getsockopt.c: Likewise. * sysdeps/stub/getsysstats.c: Likewise. * sysdeps/stub/gettimeofday.c: Likewise. * sysdeps/stub/getuid.c: Likewise. * sysdeps/stub/gtty.c: Likewise. * sysdeps/stub/ioctl.c: Likewise. * sysdeps/stub/isatty.c: Likewise. * sysdeps/stub/isfdtype.c: Likewise. * sysdeps/stub/kill.c: Likewise. * sysdeps/stub/killpg.c: Likewise. * sysdeps/stub/link.c: Likewise. * sysdeps/stub/listen.c: Likewise. * sysdeps/stub/lseek.c: Likewise. * sysdeps/stub/lxstat.c: Likewise. * sysdeps/stub/madvice.c: Likewise. * sysdeps/stub/mkdir.c: Likewise. * sysdeps/stub/mkfifo.c: Likewise. * sysdeps/stub/mkstemp.c: Likewise. * sysdeps/stub/mktemp.c: Likewise. * sysdeps/stub/mmap.c: Likewise. * sysdeps/stub/morecore.c: Likewise. * sysdeps/stub/mprotect.c: Likewise. * sysdeps/stub/msgctl.c: Likewise. * sysdeps/stub/msgget.c: Likewise. * sysdeps/stub/msgrcv.c: Likewise. * sysdeps/stub/msgsnd.c: Likewise. * sysdeps/stub/msync.c: Likewise. * sysdeps/stub/munmap.c: Likewise. * sysdeps/stub/nanosleep.c: Likewise. * sysdeps/stub/nice.c: Likewise. * sysdeps/stub/nlist.c: Likewise. * sysdeps/stub/open.c: Likewise. * sysdeps/stub/opendir.c: Likewise. * sysdeps/stub/pathconf.c: Likewise. * sysdeps/stub/pause.c: Likewise. * sysdeps/stub/pipe.c: Likewise. * sysdeps/stub/pipestream.c: Likewise. * sysdeps/stub/poll.c: Likewise. * sysdeps/stub/profil.c: Likewise. * sysdeps/stub/ptrace.c: Likewise. * sysdeps/stub/putenv.c: Likewise. * sysdeps/stub/raise.c: Likewise. * sysdeps/stub/read.c: Likewise. * sysdeps/stub/readdir.c: Likewise. * sysdeps/stub/readlink.c: Likewise. * sysdeps/stub/readv.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/recv.c: Likewise. * sysdeps/stub/recvfrom.c: Likewise. * sysdeps/stub/recvmsg.c: Likewise. * sysdeps/stub/remove.c: Likewise. * sysdeps/stub/rename.c: Likewise. * sysdeps/stub/revoke.c: Likewise. * sysdeps/stub/rewinddir.c: Likewise. * sysdeps/stub/rmdir.c: Likewise. * sysdeps/stub/sbrk.c: Likewise. * sysdeps/stub/sched_getp.c: Likewise. * sysdeps/stub/sched_gets.c: Likewise. * sysdeps/stub/sched_primax.c: Likewise. * sysdeps/stub/sched_primin.c: Likewise. * sysdeps/stub/sched_rr_gi.c: Likewise. * sysdeps/stub/sched_setp.c: Likewise. * sysdeps/stub/sched_sets.c: Likewise. * sysdeps/stub/sched_yield.c: Likewise. * sysdeps/stub/seekdir.c: Likewise. * sysdeps/stub/select.c: Likewise. * sysdeps/stub/semctl.c: Likewise. * sysdeps/stub/semget.c: Likewise. * sysdeps/stub/semop.c: Likewise. * sysdeps/stub/send.c: Likewise. * sysdeps/stub/sendmsg.c: Likewise. * sysdeps/stub/sendto.c: Likewise. * sysdeps/stub/setdomain.c: Likewise. * sysdeps/stub/setegid.c: Likewise. * sysdeps/stub/setenv.c: Likewise. * sysdeps/stub/seteuid.c: Likewise. * sysdeps/stub/setgid.c: Likewise. * sysdeps/stub/setgroups.c: Likewise. * sysdeps/stub/sethostid.c: Likewise. * sysdeps/stub/sethostname.c: Likewise. * sysdeps/stub/setitimer.c: Likewise. * sysdeps/stub/setjmp.c: Likewise. * sysdeps/stub/setlogin.c: Likewise. * sysdeps/stub/setpgid.c: Likewise. * sysdeps/stub/setpriority.c: Likewise. * sysdeps/stub/setregid.c: Likewise. * sysdeps/stub/setreuid.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * sysdeps/stub/setsid.c: Likewise. * sysdeps/stub/setsockopt.c: Likewise. * sysdeps/stub/settimeofday.c: Likewise. * sysdeps/stub/setuid.c: Likewise. * sysdeps/stub/shmat.c: Likewise. * sysdeps/stub/shmctl.c: Likewise. * sysdeps/stub/shmdt.c: Likewise. * sysdeps/stub/shmget.c: Likewise. * sysdeps/stub/shutdown.c: Likewise. * sysdeps/stub/sigaction.c: Likewise. * sysdeps/stub/sigaltstack.c: Likewise. * sysdeps/stub/sigblock.c: Likewise. * sysdeps/stub/sigintr.c: Likewise. * sysdeps/stub/signal.c: Likewise. * sysdeps/stub/sigpause.c: Likewise. * sysdeps/stub/sigpending.c: Likewise. * sysdeps/stub/sigprocmask.c: Likewise. * sysdeps/stub/sigreturn.c: Likewise. * sysdeps/stub/sigsetmask.c: Likewise. * sysdeps/stub/sigstack.c: Likewise. * sysdeps/stub/sigsuspend.c: Likewise. * sysdeps/stub/sigvec.c: Likewise. * sysdeps/stub/sleep.c: Likewise. * sysdeps/stub/socket.c: Likewise. * sysdeps/stub/socketpair.c: Likewise. * sysdeps/stub/sstk.c: Likewise. * sysdeps/stub/statfs.c: Likewise. * sysdeps/stub/stime.c: Likewise. * sysdeps/stub/stty.c: Likewise. * sysdeps/stub/swapoff.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/symlink.c: Likewise. * sysdeps/stub/sync.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/sysconf.c: Likewise. * sysdeps/stub/sysd-stdio.c: Likewise. * sysdeps/stub/system.c: Likewise. * sysdeps/stub/tcdrain.c: Likewise. * sysdeps/stub/tcflow.c: Likewise. * sysdeps/stub/tcflush.c: Likewise. * sysdeps/stub/tcgetattr.c: Likewise. * sysdeps/stub/tcgetpgrp.c: Likewise. * sysdeps/stub/tcsendbrk.c: Likewise. * sysdeps/stub/tcsetattr.c: Likewise. * sysdeps/stub/tcsetpgrp.c: Likewise. * sysdeps/stub/telldir.c: Likewise. * sysdeps/stub/tempname.c: Likewise. * sysdeps/stub/time.c: Likewise. * sysdeps/stub/times.c: Likewise. * sysdeps/stub/truncate.c: Likewise. * sysdeps/stub/ttyname.c: Likewise. * sysdeps/stub/ttyname_r.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/ulimit.c: Likewise. * sysdeps/stub/umask.c: Likewise. * sysdeps/stub/unlink.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/stub/ustat.c: Likewise. * sysdeps/stub/utime.c: Likewise. * sysdeps/stub/utimes.c: Likewise. * sysdeps/stub/vhangup.c: Likewise. * sysdeps/stub/wait.c: Likewise. * sysdeps/stub/wait3.c: Likewise. * sysdeps/stub/wait4.c: Likewise. * sysdeps/stub/waitpid.c: Likewise. * sysdeps/stub/write.c: Likewise. * sysdeps/stub/writev.c: Likewise. * sysdeps/stub/xmknod.c: Likewise. * sysdeps/stub/xstat.c: Likewise. * sysdeps/unix/closedir.c: Likewise. * sysdeps/unix/fxstat.c: Likewise. * sysdeps/unix/getlogin.c: Likewise. * sysdeps/unix/getlogin_r.c: Likewise. * sysdeps/unix/mkdir.c: Likewise. * sysdeps/unix/nice.c: Likewise. * sysdeps/unix/nlist.c: Likewise. * sysdeps/unix/opendir.c: Likewise. * sysdeps/unix/readdir.c: Likewise. * sysdeps/unix/rmdir.c: Likewise. * sysdeps/unix/stime.c: Likewise. * sysdeps/unix/xmknod.c: Likewise. * sysdeps/unix/xstat.c: Likewise. * sysdeps/unix/bsd/isatty.c: Likewise. * sysdeps/unix/bsd/setegid.c: Likewise. * sysdeps/unix/bsd/seteuid.c: Likewise. * sysdeps/unix/bsd/setsid.c: Likewise. * sysdeps/unix/bsd/sigaction.c: Likewise. * sysdeps/unix/bsd/sigprocmask.c: Likewise. * sysdeps/unix/bsd/sigsuspend.c: Likewise. * sysdeps/unix/bsd/tcflow.c: Likewise. * sysdeps/unix/bsd/tcflush.c: Likewise. * sysdeps/unix/bsd/tcgetattr.c: Likewise. * sysdeps/unix/bsd/tcsetattr.c: Likewise. * sysdeps/unix/bsd/times.c: Likewise. * sysdeps/unix/bsd/ulimit.c: Likewise. * sysdeps/unix/common/lxstat.c: Likewise. * sysdeps/unix/common/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/setrlimit.c: Likewise. * sysdeps/unix/sysv/settimeofday.c: Likewise. * sysdeps/unix/sysv/sigaction.c: Likewise. * sysdeps/unix/sysv/tcflow.c: Likewise. * sysdeps/unix/sysv/tcflush.c: Likewise. * sysdeps/unix/sysv/tcgetattr.c: Likewise. * sysdeps/unix/sysv/tcsendbrk.c: Likewise. * sysdeps/unix/sysv/tcsetattr.c: Likewise. * sysdeps/unix/bsd/ultrix4/sysconf.c: Likewise. * sysdeps/unix/sysv/irix4/getpriority.c: Likewise. * sysdeps/unix/sysv/irix4/setpriority.c: Likewise. * sysdeps/unix/sysv/linux/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/gethostid.c: Likewise. * sysdeps/unix/sysv/linux/gethostname.c: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c: Likewise. * sysdeps/unix/sysv/linux/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/speed.c: Likewise. * sysdeps/unix/sysv/linux/ulimit.c: Likewise. * sysdeps/unix/sysv/sysv4/sigaction.c: Likewise. * sysdeps/unix/sysv/sysv4/sysconf.c: Likewise. * sysdeps/unix/bsd/sun/m68k/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sparc/sigtramp.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/speed.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/tcsetattr.c: Likewise. * sysdeps/unix/sysv/linux/alpha/ioperm.c: Likewise. * sysdeps/unix/sysv/linux/i386/brk.c: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/m68k/brk.c: Likewise. * sunrpc/clnt_tcp.c: Protect declaration of errno by #ifndef. * sunrpc/clnt_udp.c: Likewise. * sunrpc/bindrsvprt.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sysdeps/generic/strtok.c: Don't check argument, just crash. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/stub/start.c: Make __errno a strong alias of errno. * sysdeps/unix/start.c: Likewise. De-ANSI-fy. * sysdeps/unix/sparc/start.c: Likewise. * sysdeps/standalone/m68k/m68020/start.S: Likewise. * sysdeps/unix/sysv/irix4/start.c: Likewise. * sysdeps/unix/bsd/ultrix4/mips/start.S: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. Mon Sep 23 17:54:57 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (main): Put package name in --version message in parantheses. Reported by Jim Meyering. * db/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * sysdeps/i386/fpu/__math.h (tan): Make sure gcc knows we use two registers. Patch by John Bowman. Sat Sep 21 15:08:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/mach/libc-lock.h: Fix comment. * sysdeps/stubs/libc-lock.h: Likewise. Sat Sep 21 13:50:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/genops.c (_IO_init) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_init macro. (_IO_default_finish) [_IO_MTSAFE_IO]: Dereference pointer to lock when passing it to __libc_lock_fini macro. Sat Sep 21 14:35:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/sysdep.h (SYSCALL_ERROR_HANDLER) [_LIBC_REENTRANT]: Add missing semicolon. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Move inclusion of sysdep.h to the top outside of #ifndef PIC. Don't include errnos.h. Use the ENTRY macro. Sat Sep 21 14:33:41 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/Makefile: Make `all' the default target. * po/Makefile: Likewise. Mon Sep 23 15:49:47 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/test-canon.c: Correct patch from Thu Sep 12 23:01:16 1996. I applied it incorrectly. * sysdeps/m68k/fpu/s_scalbn.c: Likewise. * sysdeps/m68k/fpu/s_scalbnf.c: Likewise. * sysdeps/m68k/fpu/s_scalbnl.c: Likewise. Mon Sep 23 03:00:10 1996 Ulrich Drepper <drepper@cygnus.com> * shadow/sgetspent_r.c (LINE_PARSER): Accept empty 9th field. Patch by NIIBE Yutaka <gniibe@mri.co.jp>. * shadow/sgetspent_r.c (LINE_PARSER): Don't accept any chars after 9th field. * sysdeps/unix/sysv/linux/Makefile [$(subdir)==misc] (sysdep_headers): Add sys/debugreg.h, sys/kd.h, sys/soundcard.h, and sys/vt.h. * sysdeps/unix/sysv/linux/sys/debugreg.h: New file. * sysdeps/unix/sysv/linux/sys/kd.h: New file. * sysdeps/unix/sysv/linux/sys/soundcard.h: New file. * sysdeps/unix/sysv/linux/sys/vt.h: New file. Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
909 lines
21 KiB
C
909 lines
21 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
|
||
|
||
This library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Library General Public License as
|
||
published by the Free Software Foundation; either version 2 of the
|
||
License, or (at your option) any later version.
|
||
|
||
This library is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Library General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Library General Public
|
||
License along with this library; see the file COPYING.LIB. If
|
||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||
Cambridge, MA 02139, USA. */
|
||
|
||
/* AIX requires this to be the first thing in the file. */
|
||
#if defined (_AIX) && !defined (__GNUC__)
|
||
#pragma alloca
|
||
#endif
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
/* Enable GNU extensions in glob.h. */
|
||
#ifndef _GNU_SOURCE
|
||
#define _GNU_SOURCE 1
|
||
#endif
|
||
|
||
#include <errno.h>
|
||
#include <sys/types.h>
|
||
#include <sys/stat.h>
|
||
|
||
|
||
/* Comment out all this code if we are using the GNU C Library, and are not
|
||
actually compiling the library itself. This code is part of the GNU C
|
||
Library, but also included in many other GNU distributions. Compiling
|
||
and linking in this code is a waste when using the GNU C library
|
||
(especially if it is a shared library). Rather than having every GNU
|
||
program understand `configure --with-gnu-libc' and omit the object files,
|
||
it is simpler to just do this in the source for each such file. */
|
||
|
||
#define GLOB_INTERFACE_VERSION 1
|
||
#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
|
||
#include <gnu-versions.h>
|
||
#if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
|
||
#define ELIDE_CODE
|
||
#endif
|
||
#endif
|
||
|
||
#ifndef ELIDE_CODE
|
||
|
||
#ifdef STDC_HEADERS
|
||
#include <stddef.h>
|
||
#endif
|
||
|
||
#ifdef HAVE_UNISTD_H
|
||
#include <unistd.h>
|
||
#ifndef POSIX
|
||
#ifdef _POSIX_VERSION
|
||
#define POSIX
|
||
#endif
|
||
#endif
|
||
#endif
|
||
|
||
#if !defined (_AMIGA) && !defined (VMS) && !defined(WIN32)
|
||
#include <pwd.h>
|
||
#endif
|
||
|
||
#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
|
||
extern int errno;
|
||
#endif
|
||
#ifndef __set_errno
|
||
#define __set_errno(val) errno = (val)
|
||
#endif
|
||
|
||
#ifndef NULL
|
||
#define NULL 0
|
||
#endif
|
||
|
||
|
||
#if defined (HAVE_DIRENT_H) || defined (__GNU_LIBRARY__)
|
||
# include <dirent.h>
|
||
# define NAMLEN(dirent) strlen((dirent)->d_name)
|
||
#else
|
||
# define dirent direct
|
||
# define NAMLEN(dirent) (dirent)->d_namlen
|
||
# ifdef HAVE_SYS_NDIR_H
|
||
# include <sys/ndir.h>
|
||
# endif
|
||
# ifdef HAVE_SYS_DIR_H
|
||
# include <sys/dir.h>
|
||
# endif
|
||
# ifdef HAVE_NDIR_H
|
||
# include <ndir.h>
|
||
# endif
|
||
# ifdef HAVE_VMSDIR_H
|
||
# include "vmsdir.h"
|
||
# endif /* HAVE_VMSDIR_H */
|
||
#endif
|
||
|
||
|
||
/* In GNU systems, <dirent.h> defines this macro for us. */
|
||
#ifdef _D_NAMLEN
|
||
#undef NAMLEN
|
||
#define NAMLEN(d) _D_NAMLEN(d)
|
||
#endif
|
||
|
||
|
||
#if (defined (POSIX) || defined (WIN32)) && !defined (__GNU_LIBRARY__)
|
||
/* Posix does not require that the d_ino field be present, and some
|
||
systems do not provide it. */
|
||
#define REAL_DIR_ENTRY(dp) 1
|
||
#else
|
||
#define REAL_DIR_ENTRY(dp) (dp->d_ino != 0)
|
||
#endif /* POSIX */
|
||
|
||
#if (defined (STDC_HEADERS) || defined (__GNU_LIBRARY__))
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#define ANSI_STRING
|
||
#else /* No standard headers. */
|
||
|
||
extern char *getenv ();
|
||
|
||
#ifdef HAVE_STRING_H
|
||
#include <string.h>
|
||
#define ANSI_STRING
|
||
#else
|
||
#include <strings.h>
|
||
#endif
|
||
#ifdef HAVE_MEMORY_H
|
||
#include <memory.h>
|
||
#endif
|
||
|
||
extern char *malloc (), *realloc ();
|
||
extern void free ();
|
||
|
||
extern void qsort ();
|
||
extern void abort (), exit ();
|
||
|
||
#endif /* Standard headers. */
|
||
|
||
#ifndef ANSI_STRING
|
||
|
||
#ifndef bzero
|
||
extern void bzero ();
|
||
#endif
|
||
#ifndef bcopy
|
||
extern void bcopy ();
|
||
#endif
|
||
|
||
#define memcpy(d, s, n) bcopy ((s), (d), (n))
|
||
#define strrchr rindex
|
||
/* memset is only used for zero here, but let's be paranoid. */
|
||
#define memset(s, better_be_zero, n) \
|
||
((void) ((better_be_zero) == 0 ? (bzero((s), (n)), 0) : (abort(), 0)))
|
||
#endif /* Not ANSI_STRING. */
|
||
|
||
#ifndef HAVE_STRCOLL
|
||
#define strcoll strcmp
|
||
#endif
|
||
|
||
|
||
#ifndef __GNU_LIBRARY__
|
||
#ifdef __GNUC__
|
||
__inline
|
||
#endif
|
||
#ifndef __SASC
|
||
#ifdef WIN32
|
||
static void *
|
||
#else
|
||
static char *
|
||
#endif
|
||
my_realloc (p, n)
|
||
char *p;
|
||
unsigned int n;
|
||
{
|
||
/* These casts are the for sake of the broken Ultrix compiler,
|
||
which warns of illegal pointer combinations otherwise. */
|
||
if (p == NULL)
|
||
return (char *) malloc (n);
|
||
return (char *) realloc (p, n);
|
||
}
|
||
#define realloc my_realloc
|
||
#endif /* __SASC */
|
||
#endif /* __GNU_LIBRARY__ */
|
||
|
||
|
||
#if !defined(__alloca) && !defined(__GNU_LIBRARY__)
|
||
|
||
#ifdef __GNUC__
|
||
#undef alloca
|
||
#define alloca(n) __builtin_alloca (n)
|
||
#else /* Not GCC. */
|
||
#ifdef HAVE_ALLOCA_H
|
||
#include <alloca.h>
|
||
#else /* Not HAVE_ALLOCA_H. */
|
||
#ifndef _AIX
|
||
#ifdef WIN32
|
||
#include <malloc.h>
|
||
#else
|
||
extern char *alloca ();
|
||
#endif /* WIN32 */
|
||
#endif /* Not _AIX. */
|
||
#endif /* sparc or HAVE_ALLOCA_H. */
|
||
#endif /* GCC. */
|
||
|
||
#define __alloca alloca
|
||
|
||
#endif
|
||
|
||
#ifndef __GNU_LIBRARY__
|
||
#define __stat stat
|
||
#ifdef STAT_MACROS_BROKEN
|
||
#undef S_ISDIR
|
||
#endif
|
||
#ifndef S_ISDIR
|
||
#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
|
||
#endif
|
||
#endif
|
||
|
||
#ifndef STDC_HEADERS
|
||
#undef size_t
|
||
#define size_t unsigned int
|
||
#endif
|
||
|
||
/* Some system header files erroneously define these.
|
||
We want our own definitions from <fnmatch.h> to take precedence. */
|
||
#undef FNM_PATHNAME
|
||
#undef FNM_NOESCAPE
|
||
#undef FNM_PERIOD
|
||
#include <fnmatch.h>
|
||
|
||
/* Some system header files erroneously define these.
|
||
We want our own definitions from <glob.h> to take precedence. */
|
||
#undef GLOB_ERR
|
||
#undef GLOB_MARK
|
||
#undef GLOB_NOSORT
|
||
#undef GLOB_DOOFFS
|
||
#undef GLOB_NOCHECK
|
||
#undef GLOB_APPEND
|
||
#undef GLOB_NOESCAPE
|
||
#undef GLOB_PERIOD
|
||
#include <glob.h>
|
||
|
||
static int glob_pattern_p __P ((const char *pattern, int quote));
|
||
static int glob_in_dir __P ((const char *pattern, const char *directory,
|
||
int flags,
|
||
int (*errfunc) __P ((const char *, int)),
|
||
glob_t *pglob));
|
||
static int prefix_array __P ((const char *prefix, char **array, size_t n));
|
||
static int collated_compare __P ((const __ptr_t, const __ptr_t));
|
||
|
||
/* Do glob searching for PATTERN, placing results in PGLOB.
|
||
The bits defined above may be set in FLAGS.
|
||
If a directory cannot be opened or read and ERRFUNC is not nil,
|
||
it is called with the pathname that caused the error, and the
|
||
`errno' value from the failing call; if it returns non-zero
|
||
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
|
||
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
|
||
Otherwise, `glob' returns zero. */
|
||
int
|
||
glob (pattern, flags, errfunc, pglob)
|
||
const char *pattern;
|
||
int flags;
|
||
int (*errfunc) __P ((const char *, int));
|
||
glob_t *pglob;
|
||
{
|
||
const char *filename;
|
||
char *dirname;
|
||
size_t dirlen;
|
||
int status;
|
||
int oldcount;
|
||
|
||
if (pattern == NULL || pglob == NULL || (flags & ~__GLOB_FLAGS) != 0)
|
||
{
|
||
__set_errno (EINVAL);
|
||
return -1;
|
||
}
|
||
|
||
if (flags & GLOB_BRACE)
|
||
{
|
||
const char *begin = strchr (pattern, '{');
|
||
if (begin != NULL)
|
||
{
|
||
int firstc;
|
||
size_t restlen;
|
||
const char *p, *end, *next;
|
||
unsigned int depth = 0;
|
||
|
||
/* Find the end of the brace expression, by counting braces.
|
||
While we're at it, notice the first comma at top brace level. */
|
||
end = begin + 1;
|
||
next = NULL;
|
||
while (1)
|
||
{
|
||
switch (*end++)
|
||
{
|
||
case ',':
|
||
if (depth == 0 && next == NULL)
|
||
next = end;
|
||
continue;
|
||
case '{':
|
||
++depth;
|
||
continue;
|
||
case '}':
|
||
if (depth-- == 0)
|
||
break;
|
||
continue;
|
||
case '\0':
|
||
return glob (pattern, flags &~ GLOB_BRACE, errfunc, pglob);
|
||
}
|
||
break;
|
||
}
|
||
restlen = strlen (end) + 1;
|
||
if (next == NULL)
|
||
next = end;
|
||
|
||
/* We have a brace expression. BEGIN points to the opening {,
|
||
NEXT points past the terminator of the first element, and END
|
||
points past the final }. We will accumulate result names from
|
||
recursive runs for each brace alternative in the buffer using
|
||
GLOB_APPEND. */
|
||
|
||
if (!(flags & GLOB_APPEND))
|
||
{
|
||
/* This call is to set a new vector, so clear out the
|
||
vector so we can append to it. */
|
||
pglob->gl_pathc = 0;
|
||
pglob->gl_pathv = NULL;
|
||
}
|
||
firstc = pglob->gl_pathc;
|
||
|
||
/* In this loop P points to the beginning of the current element
|
||
and NEXT points past its terminator. */
|
||
p = begin + 1;
|
||
while (1)
|
||
{
|
||
/* Construct a whole name that is one of the brace
|
||
alternatives in a temporary buffer. */
|
||
int result;
|
||
size_t bufsz = (begin - pattern) + (next - 1 - p) + restlen;
|
||
#ifdef __GNUC__
|
||
char onealt[bufsz];
|
||
#else
|
||
char *onealt = malloc (bufsz);
|
||
if (onealt == NULL)
|
||
{
|
||
if (!(flags & GLOB_APPEND))
|
||
globfree (pglob);
|
||
return GLOB_NOSPACE;
|
||
}
|
||
#endif
|
||
memcpy (onealt, pattern, begin - pattern);
|
||
memcpy (&onealt[begin - pattern], p, next - 1 - p);
|
||
memcpy (&onealt[(begin - pattern) + (next - 1 - p)],
|
||
end, restlen);
|
||
result = glob (onealt,
|
||
((flags & ~(GLOB_NOCHECK|GLOB_NOMAGIC)) |
|
||
GLOB_APPEND), errfunc, pglob);
|
||
#ifndef __GNUC__
|
||
free (onealt);
|
||
#endif
|
||
|
||
/* If we got an error, return it. */
|
||
if (result && result != GLOB_NOMATCH)
|
||
{
|
||
if (!(flags & GLOB_APPEND))
|
||
globfree (pglob);
|
||
return result;
|
||
}
|
||
|
||
/* Advance past this alternative and process the next. */
|
||
p = next;
|
||
depth = 0;
|
||
scan:
|
||
switch (*p++)
|
||
{
|
||
case ',':
|
||
if (depth == 0)
|
||
{
|
||
/* Found the next alternative. Loop to glob it. */
|
||
next = p;
|
||
continue;
|
||
}
|
||
goto scan;
|
||
case '{':
|
||
++depth;
|
||
goto scan;
|
||
case '}':
|
||
if (depth-- == 0)
|
||
/* End of the brace expression. Break out of the loop. */
|
||
break;
|
||
goto scan;
|
||
}
|
||
}
|
||
|
||
if (pglob->gl_pathc == firstc &&
|
||
!(flags & (GLOB_NOCHECK|GLOB_NOMAGIC)))
|
||
return GLOB_NOMATCH;
|
||
}
|
||
}
|
||
|
||
/* Find the filename. */
|
||
filename = strrchr (pattern, '/');
|
||
if (filename == NULL)
|
||
{
|
||
filename = pattern;
|
||
#ifdef _AMIGA
|
||
dirname = (char *) "";
|
||
#else
|
||
dirname = (char *) ".";
|
||
#endif
|
||
dirlen = 0;
|
||
}
|
||
else if (filename == pattern)
|
||
{
|
||
/* "/pattern". */
|
||
dirname = (char *) "/";
|
||
dirlen = 1;
|
||
++filename;
|
||
}
|
||
else
|
||
{
|
||
dirlen = filename - pattern;
|
||
dirname = (char *) __alloca (dirlen + 1);
|
||
memcpy (dirname, pattern, dirlen);
|
||
dirname[dirlen] = '\0';
|
||
++filename;
|
||
}
|
||
|
||
if (filename[0] == '\0' && dirlen > 1)
|
||
/* "pattern/". Expand "pattern", appending slashes. */
|
||
{
|
||
int val = glob (dirname, flags | GLOB_MARK, errfunc, pglob);
|
||
if (val == 0)
|
||
pglob->gl_flags = (pglob->gl_flags & ~GLOB_MARK) | (flags & GLOB_MARK);
|
||
return val;
|
||
}
|
||
|
||
if (!(flags & GLOB_APPEND))
|
||
{
|
||
pglob->gl_pathc = 0;
|
||
pglob->gl_pathv = NULL;
|
||
}
|
||
|
||
oldcount = pglob->gl_pathc;
|
||
|
||
#ifndef VMS
|
||
if ((flags & GLOB_TILDE) && dirname[0] == '~')
|
||
{
|
||
if (dirname[1] == '\0')
|
||
{
|
||
/* Look up home directory. */
|
||
dirname = getenv ("HOME");
|
||
#ifdef _AMIGA
|
||
if (dirname == NULL || dirname[0] == '\0')
|
||
dirname = "SYS:";
|
||
#else
|
||
#ifdef WIN32
|
||
if (dirname == NULL || dirname[0] == '\0')
|
||
dirname = "c:/users/default"; /* poor default */
|
||
#else
|
||
if (dirname == NULL || dirname[0] == '\0')
|
||
{
|
||
extern char *getlogin __P ((void));
|
||
char *name = getlogin ();
|
||
if (name != NULL)
|
||
{
|
||
struct passwd *p = getpwnam (name);
|
||
if (p != NULL)
|
||
dirname = p->pw_dir;
|
||
}
|
||
}
|
||
if (dirname == NULL || dirname[0] == '\0')
|
||
dirname = (char *) "~"; /* No luck. */
|
||
#endif /* WIN32 */
|
||
#endif
|
||
}
|
||
else
|
||
{
|
||
#ifdef _AMIGA
|
||
if (dirname == NULL || dirname[0] == '\0')
|
||
dirname = "SYS:";
|
||
#else
|
||
#ifdef WIN32
|
||
if (dirname == NULL || dirname[0] == '\0')
|
||
dirname = "c:/users/default"; /* poor default */
|
||
#else
|
||
/* Look up specific user's home directory. */
|
||
struct passwd *p = getpwnam (dirname + 1);
|
||
if (p != NULL)
|
||
dirname = p->pw_dir;
|
||
#endif /* WIN32 */
|
||
#endif
|
||
}
|
||
}
|
||
#endif /* Not VMS. */
|
||
|
||
if (glob_pattern_p (dirname, !(flags & GLOB_NOESCAPE)))
|
||
{
|
||
/* The directory name contains metacharacters, so we
|
||
have to glob for the directory, and then glob for
|
||
the pattern in each directory found. */
|
||
glob_t dirs;
|
||
register int i;
|
||
|
||
status = glob (dirname,
|
||
((flags & (GLOB_ERR | GLOB_NOCHECK | GLOB_NOESCAPE)) |
|
||
GLOB_NOSORT),
|
||
errfunc, &dirs);
|
||
if (status != 0)
|
||
return status;
|
||
|
||
/* We have successfully globbed the preceding directory name.
|
||
For each name we found, call glob_in_dir on it and FILENAME,
|
||
appending the results to PGLOB. */
|
||
for (i = 0; i < dirs.gl_pathc; ++i)
|
||
{
|
||
int oldcount;
|
||
|
||
#ifdef SHELL
|
||
{
|
||
/* Make globbing interruptible in the bash shell. */
|
||
extern int interrupt_state;
|
||
|
||
if (interrupt_state)
|
||
{
|
||
globfree (&dirs);
|
||
globfree (&files);
|
||
return GLOB_ABEND;
|
||
}
|
||
}
|
||
#endif /* SHELL. */
|
||
|
||
oldcount = pglob->gl_pathc;
|
||
status = glob_in_dir (filename, dirs.gl_pathv[i],
|
||
(flags | GLOB_APPEND) & ~GLOB_NOCHECK,
|
||
errfunc, pglob);
|
||
if (status == GLOB_NOMATCH)
|
||
/* No matches in this directory. Try the next. */
|
||
continue;
|
||
|
||
if (status != 0)
|
||
{
|
||
globfree (&dirs);
|
||
globfree (pglob);
|
||
return status;
|
||
}
|
||
|
||
/* Stick the directory on the front of each name. */
|
||
if (prefix_array (dirs.gl_pathv[i],
|
||
&pglob->gl_pathv[oldcount],
|
||
pglob->gl_pathc - oldcount))
|
||
{
|
||
globfree (&dirs);
|
||
globfree (pglob);
|
||
return GLOB_NOSPACE;
|
||
}
|
||
}
|
||
|
||
flags |= GLOB_MAGCHAR;
|
||
|
||
if (pglob->gl_pathc == oldcount)
|
||
/* No matches. */
|
||
if (flags & GLOB_NOCHECK)
|
||
{
|
||
size_t len = strlen (pattern) + 1;
|
||
char *patcopy = (char *) malloc (len);
|
||
if (patcopy == NULL)
|
||
return GLOB_NOSPACE;
|
||
memcpy (patcopy, pattern, len);
|
||
|
||
pglob->gl_pathv
|
||
= (char **) realloc (pglob->gl_pathv,
|
||
(pglob->gl_pathc +
|
||
((flags & GLOB_DOOFFS) ?
|
||
pglob->gl_offs : 0) +
|
||
1 + 1) *
|
||
sizeof (char *));
|
||
if (pglob->gl_pathv == NULL)
|
||
{
|
||
free (patcopy);
|
||
return GLOB_NOSPACE;
|
||
}
|
||
|
||
if (flags & GLOB_DOOFFS)
|
||
while (pglob->gl_pathc < pglob->gl_offs)
|
||
pglob->gl_pathv[pglob->gl_pathc++] = NULL;
|
||
|
||
pglob->gl_pathv[pglob->gl_pathc++] = patcopy;
|
||
pglob->gl_pathv[pglob->gl_pathc] = NULL;
|
||
pglob->gl_flags = flags;
|
||
}
|
||
else
|
||
return GLOB_NOMATCH;
|
||
}
|
||
else
|
||
{
|
||
status = glob_in_dir (filename, dirname, flags, errfunc, pglob);
|
||
if (status != 0)
|
||
return status;
|
||
|
||
if (dirlen > 0)
|
||
{
|
||
/* Stick the directory on the front of each name. */
|
||
if (prefix_array (dirname,
|
||
&pglob->gl_pathv[oldcount],
|
||
pglob->gl_pathc - oldcount))
|
||
{
|
||
globfree (pglob);
|
||
return GLOB_NOSPACE;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (flags & GLOB_MARK)
|
||
{
|
||
/* Append slashes to directory names. */
|
||
int i;
|
||
struct stat st;
|
||
for (i = oldcount; i < pglob->gl_pathc; ++i)
|
||
if (((flags & GLOB_ALTDIRFUNC) ?
|
||
(*pglob->gl_stat) (pglob->gl_pathv[i], &st) :
|
||
__stat (pglob->gl_pathv[i], &st)) == 0 &&
|
||
S_ISDIR (st.st_mode))
|
||
{
|
||
size_t len = strlen (pglob->gl_pathv[i]) + 2;
|
||
char *new = realloc (pglob->gl_pathv[i], len);
|
||
if (new == NULL)
|
||
{
|
||
globfree (pglob);
|
||
return GLOB_NOSPACE;
|
||
}
|
||
strcpy (&new[len - 2], "/");
|
||
pglob->gl_pathv[i] = new;
|
||
}
|
||
}
|
||
|
||
if (!(flags & GLOB_NOSORT))
|
||
/* Sort the vector. */
|
||
qsort ((__ptr_t) &pglob->gl_pathv[oldcount],
|
||
pglob->gl_pathc - oldcount,
|
||
sizeof (char *), collated_compare);
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Free storage allocated in PGLOB by a previous `glob' call. */
|
||
void
|
||
globfree (pglob)
|
||
register glob_t *pglob;
|
||
{
|
||
if (pglob->gl_pathv != NULL)
|
||
{
|
||
register int i;
|
||
for (i = 0; i < pglob->gl_pathc; ++i)
|
||
if (pglob->gl_pathv[i] != NULL)
|
||
free ((__ptr_t) pglob->gl_pathv[i]);
|
||
free ((__ptr_t) pglob->gl_pathv);
|
||
}
|
||
}
|
||
|
||
|
||
/* Do a collated comparison of A and B. */
|
||
static int
|
||
collated_compare (a, b)
|
||
const __ptr_t a;
|
||
const __ptr_t b;
|
||
{
|
||
const char *const s1 = *(const char *const * const) a;
|
||
const char *const s2 = *(const char *const * const) b;
|
||
|
||
if (s1 == s2)
|
||
return 0;
|
||
if (s1 == NULL)
|
||
return 1;
|
||
if (s2 == NULL)
|
||
return -1;
|
||
return strcoll (s1, s2);
|
||
}
|
||
|
||
|
||
/* Prepend DIRNAME to each of N members of ARRAY, replacing ARRAY's
|
||
elements in place. Return nonzero if out of memory, zero if successful.
|
||
A slash is inserted between DIRNAME and each elt of ARRAY,
|
||
unless DIRNAME is just "/". Each old element of ARRAY is freed. */
|
||
static int
|
||
prefix_array (dirname, array, n)
|
||
const char *dirname;
|
||
char **array;
|
||
size_t n;
|
||
{
|
||
register size_t i;
|
||
size_t dirlen = strlen (dirname);
|
||
|
||
if (dirlen == 1 && dirname[0] == '/')
|
||
/* DIRNAME is just "/", so normal prepending would get us "//foo".
|
||
We want "/foo" instead, so don't prepend any chars from DIRNAME. */
|
||
dirlen = 0;
|
||
|
||
for (i = 0; i < n; ++i)
|
||
{
|
||
size_t eltlen = strlen (array[i]) + 1;
|
||
char *new = (char *) malloc (dirlen + 1 + eltlen);
|
||
if (new == NULL)
|
||
{
|
||
while (i > 0)
|
||
free ((__ptr_t) array[--i]);
|
||
return 1;
|
||
}
|
||
|
||
memcpy (new, dirname, dirlen);
|
||
new[dirlen] = '/';
|
||
memcpy (&new[dirlen + 1], array[i], eltlen);
|
||
free ((__ptr_t) array[i]);
|
||
array[i] = new;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Return nonzero if PATTERN contains any metacharacters.
|
||
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
|
||
static int
|
||
glob_pattern_p (pattern, quote)
|
||
const char *pattern;
|
||
int quote;
|
||
{
|
||
register const char *p;
|
||
int open = 0;
|
||
|
||
for (p = pattern; *p != '\0'; ++p)
|
||
switch (*p)
|
||
{
|
||
case '?':
|
||
case '*':
|
||
return 1;
|
||
|
||
case '\\':
|
||
if (quote && p[1] != '\0')
|
||
++p;
|
||
break;
|
||
|
||
case '[':
|
||
open = 1;
|
||
break;
|
||
|
||
case ']':
|
||
if (open)
|
||
return 1;
|
||
break;
|
||
}
|
||
|
||
return 0;
|
||
}
|
||
|
||
|
||
/* Like `glob', but PATTERN is a final pathname component,
|
||
and matches are searched for in DIRECTORY.
|
||
The GLOB_NOSORT bit in FLAGS is ignored. No sorting is ever done.
|
||
The GLOB_APPEND flag is assumed to be set (always appends). */
|
||
static int
|
||
glob_in_dir (pattern, directory, flags, errfunc, pglob)
|
||
const char *pattern;
|
||
const char *directory;
|
||
int flags;
|
||
int (*errfunc) __P ((const char *, int));
|
||
glob_t *pglob;
|
||
{
|
||
__ptr_t stream;
|
||
|
||
struct globlink
|
||
{
|
||
struct globlink *next;
|
||
char *name;
|
||
};
|
||
struct globlink *names = NULL;
|
||
size_t nfound = 0;
|
||
|
||
if (!glob_pattern_p (pattern, !(flags & GLOB_NOESCAPE)))
|
||
{
|
||
stream = NULL;
|
||
flags |= GLOB_NOCHECK;
|
||
}
|
||
else
|
||
{
|
||
flags |= GLOB_MAGCHAR;
|
||
|
||
stream = ((flags & GLOB_ALTDIRFUNC) ?
|
||
(*pglob->gl_opendir) (directory) :
|
||
(__ptr_t) opendir (directory));
|
||
if (stream == NULL)
|
||
{
|
||
if ((errfunc != NULL && (*errfunc) (directory, errno)) ||
|
||
(flags & GLOB_ERR))
|
||
return GLOB_ABEND;
|
||
}
|
||
else
|
||
while (1)
|
||
{
|
||
const char *name;
|
||
size_t len;
|
||
struct dirent *d = ((flags & GLOB_ALTDIRFUNC) ?
|
||
(*pglob->gl_readdir) (stream) :
|
||
readdir ((DIR *) stream));
|
||
if (d == NULL)
|
||
break;
|
||
if (! REAL_DIR_ENTRY (d))
|
||
continue;
|
||
|
||
name = d->d_name;
|
||
|
||
if (fnmatch (pattern, name,
|
||
(!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0) |
|
||
((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
|
||
#ifdef _AMIGA
|
||
| FNM_CASEFOLD
|
||
#endif
|
||
) == 0)
|
||
{
|
||
struct globlink *new
|
||
= (struct globlink *) __alloca (sizeof (struct globlink));
|
||
len = NAMLEN (d);
|
||
new->name
|
||
= (char *) malloc (len + 1);
|
||
if (new->name == NULL)
|
||
goto memory_error;
|
||
memcpy ((__ptr_t) new->name, name, len);
|
||
new->name[len] = '\0';
|
||
new->next = names;
|
||
names = new;
|
||
++nfound;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (nfound == 0 && (flags & GLOB_NOMAGIC) &&
|
||
! glob_pattern_p (pattern, !(flags & GLOB_NOESCAPE)))
|
||
flags |= GLOB_NOCHECK;
|
||
|
||
if (nfound == 0 && (flags & GLOB_NOCHECK))
|
||
{
|
||
size_t len = strlen (pattern);
|
||
nfound = 1;
|
||
names = (struct globlink *) __alloca (sizeof (struct globlink));
|
||
names->next = NULL;
|
||
names->name = (char *) malloc (len + 1);
|
||
if (names->name == NULL)
|
||
goto memory_error;
|
||
memcpy (names->name, pattern, len);
|
||
names->name[len] = '\0';
|
||
}
|
||
|
||
pglob->gl_pathv
|
||
= (char **) realloc (pglob->gl_pathv,
|
||
(pglob->gl_pathc +
|
||
((flags & GLOB_DOOFFS) ? pglob->gl_offs : 0) +
|
||
nfound + 1) *
|
||
sizeof (char *));
|
||
if (pglob->gl_pathv == NULL)
|
||
goto memory_error;
|
||
|
||
if (flags & GLOB_DOOFFS)
|
||
while (pglob->gl_pathc < pglob->gl_offs)
|
||
pglob->gl_pathv[pglob->gl_pathc++] = NULL;
|
||
|
||
for (; names != NULL; names = names->next)
|
||
pglob->gl_pathv[pglob->gl_pathc++] = names->name;
|
||
pglob->gl_pathv[pglob->gl_pathc] = NULL;
|
||
|
||
pglob->gl_flags = flags;
|
||
|
||
if (stream != NULL)
|
||
{
|
||
int save = errno;
|
||
if (flags & GLOB_ALTDIRFUNC)
|
||
(*pglob->gl_closedir) (stream);
|
||
else
|
||
closedir ((DIR *) stream);
|
||
__set_errno (save);
|
||
}
|
||
return nfound == 0 ? GLOB_NOMATCH : 0;
|
||
|
||
memory_error:
|
||
{
|
||
int save = errno;
|
||
if (flags & GLOB_ALTDIRFUNC)
|
||
(*pglob->gl_closedir) (stream);
|
||
else
|
||
closedir ((DIR *) stream);
|
||
__set_errno (save);
|
||
}
|
||
while (names != NULL)
|
||
{
|
||
if (names->name != NULL)
|
||
free ((__ptr_t) names->name);
|
||
names = names->next;
|
||
}
|
||
return GLOB_NOSPACE;
|
||
}
|
||
|
||
#endif /* Not ELIDE_CODE. */
|