diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
commit | f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9 (patch) | |
tree | f64c3eeda0e9acc58b96c28ca852a014c822047f /login | |
parent | 42054ddb496798d9b936490cf0050f6619f86bc1 (diff) | |
download | glibc-f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9.tar.gz glibc-f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9.tar.xz glibc-f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9.zip |
update from main archive 961207 cvs/libc-961208
Sun Dec 8 06:56:49 1996 Ulrich Drepper <drepper@cygnus.com> * io/getwd.c: Use PATH_MAX not LOCAL_PATH_MAX. Fix typo in comment. * stdlib/canonicalize.c: Correct bugs in last change. Patch by HJ Lu. * libio/Makefile (routines): Remove ioprims. (aux): Remove cleanup. Add IO_DEBUG option for .o files. * libio/cleanups.c: Removed. * libio/ioprims.c: Removed. * libio/filedoalloc.c: More updates from libg++-2.8b5. * libio/fileops.c: Likewise. * libio/genops.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopopen.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/strfile.h: Likewise. * libio/vasprintf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/stdio.h: Define P_tmpdir only is __USE_SVID. * manual/arith.texi: Change references to ANSI C to ISO C. * manual/conf.texi: Likewise. * manual/creature.texi: Likewise. * manual/ctype.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/intro.texi. Likewise. * manual/io.texi: Likewise. * manual/lang.texi: Likewise. * manual/libc.texinfo: Likewise. * manual/locale.texi: Likewise. * manual/maint.texi: Likewise. * manual/mbyte.texi: Likewise. * manual/memory.texi: Likewise. * manual/process.texi: Likewise. * manual/process.texi: Likewise. * manual/search.texi: Likewise. * manual/setjmp.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/string.texi: Likewise. * manual/time.texi: Likewise. * manual/locale.texi: Remove description of LC_RESPONSE and add LC_MESSAGES. * Makefile (subdirs): Change malloc in $(malloc). * config.make.in: Add variable malloc which is initialized from @malloc@. * configure.in: Add new option --enable-new-malloc to use new malloc. This is the default on Linux. * sysdeps/unix/sysv/linux/configure.in: Define malloc to new-malloc by default. * new-malloc/Makefile: New file. Improved malloc implementation. * new-malloc/malloc.c: Likewise. * new-malloc/malloc.h: Likewise. * new-malloc/mallocbug.c: Likewise. * new-malloc/obstack.c: Likewise. * new-malloc/obstack.h: Likewise. * new-malloc/thread-m.h: Likewise. * time/Makefile: Compile ap.c with NO_MCHECK flag for now. * time/ap.c: Don't call mcheck if NO_MCHECK is defined. * resolv/Makefile: Add rule to rebuiild libresolv.so when libc.so changed. * stdio/feof.c: Update copyright. * stdio/stdio.h: Add field for lock to FILE structure. Add cast to *MAGIC constants to prevent warnings. * stdio-common/bug7.c: Correct test. Stream must not be closed twice. * stdlib/Makefile (routines): Add secure-getenv. * stdlib/secure-getenv.c: New file. __secure_getenv function moved to here from sysdeps/generic/getenv.c. Otherwise an application cannot replace the getenv function in the libc. * sysdeps/generic/getenv.c: Remove __secure_getenv function. * sysdeps/stub/getenv.c: Remove __secure_getenv alias. * sysdeps/mach/libc-lock.h: Define__libc_mutex_lock to __mutex_lock. * sysdeps/posix/fdopen.c: Update copyright. Don't use EXFUN. * time/test-tz.c: Comment fifth test out. PROBLEM. * time/tzset.c: De-ANSI-declfy. (__tzset): Don't increment pointer tz when no DST information is given. Sat Dec 7 23:47:54 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/mach/libc-lock.h [_LIBC]: Add definition of __libc_mutex_lock. Patch by Thomas Bushnell. * sysdeps/unix/sysv/linux/timebits.h: Load <asm/param.h> only if __USE_MISC. * sysdeps/unix/sysv/linux/Dist: Add llseek.c. Sat Dec 7 12:18:56 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime (%c format): Remove %Z from default string. Reported by Paul Eggert * io/getwd.c: Don't apply getcwd on user supplied buffer.
Diffstat (limited to 'login')
-rw-r--r-- | login/endutent.c | 31 | ||||
-rw-r--r-- | login/endutent_r.c | 33 | ||||
-rw-r--r-- | login/pututline.c | 34 | ||||
-rw-r--r-- | login/pututline_r.c | 133 | ||||
-rw-r--r-- | login/setutent.c | 31 | ||||
-rw-r--r-- | login/setutent_r.c | 76 |
6 files changed, 0 insertions, 338 deletions
diff --git a/login/endutent.c b/login/endutent.c deleted file mode 100644 index 3df95bef93..0000000000 --- a/login/endutent.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C 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. - -The GNU C 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 the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <utmp.h> - - -/* The global data defined in setutent.c. */ -extern struct utmp_data __utmp_data; - - -void -endutent (void) -{ - __endutent_r (&__utmp_data); -} diff --git a/login/endutent_r.c b/login/endutent_r.c deleted file mode 100644 index a531054a2a..0000000000 --- a/login/endutent_r.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C 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. - -The GNU C 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 the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <unistd.h> -#include <utmp.h> - - -void -__endutent_r (struct utmp_data *utmp_data) -{ - if (utmp_data->ut_fd != -1) - { - close (utmp_data->ut_fd); - utmp_data->ut_fd = -1; - } -} -weak_alias (__endutent_r, endutent_r) diff --git a/login/pututline.c b/login/pututline.c deleted file mode 100644 index 7af3efbb46..0000000000 --- a/login/pututline.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C 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. - -The GNU C 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 the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <utmp.h> - - -/* The global data defined in setutent.c. */ -extern struct utmp_data __utmp_data; - - -struct utmp * -pututline (const struct utmp *utmp) -{ - if (__pututline_r (utmp, &__utmp_data) < 0) - return NULL; - - return (struct utmp *) utmp; -} diff --git a/login/pututline_r.c b/login/pututline_r.c deleted file mode 100644 index 33ba96f461..0000000000 --- a/login/pututline_r.c +++ /dev/null @@ -1,133 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C 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. - -The GNU C 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 the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <alloca.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <utmp.h> -#include <sys/file.h> -#include <sys/stat.h> - - -/* XXX An alternative solution would be to call a SUID root program - which write the new value. */ - -int -__pututline_r (const struct utmp *id, struct utmp_data *utmp_data) -{ - struct stat st; - int result = 0; - -#if _HAVE_UT_TYPE - 0 - /* Test whether ID has any of the legal types because we have to - prevent illegal entries. */ - if (id->ut_type != RUN_LVL && id->ut_type != BOOT_TIME - && id->ut_type != OLD_TIME && id->ut_type != NEW_TIME - && id->ut_type != INIT_PROCESS && id->ut_type != LOGIN_PROCESS - && id->ut_type != USER_PROCESS && id->ut_type != DEAD_PROCESS) - /* No, using '<' and '>' for the test is not possible. */ - { - __set_errno (EINVAL); - return -1; - } -#endif - - /* Open utmp file if not already done. */ - if (utmp_data->ut_fd == -1) - { - setutent_r (utmp_data); - if (utmp_data->ut_fd == -1) - return -1; - } - -#if _HAVE_UT_ID - 0 - /* Check whether we need to reposition. Repositioning is necessary - either if the data in UTMP_DATA is not valid or if the ids don't - match: */ - if (id->ut_id[0] - && (utmp_data->loc_utmp < (off_t) sizeof (struct utmp) - || strncmp (utmp_data->ubuf.ut_id, id->ut_id, - sizeof (id->ut_id)) != 0)) - { - /* We must not overwrite the data in UTMP_DATA since ID may be - aliasing it. */ - struct utmp_data *data_tmp = alloca (sizeof (*data_tmp)); - struct utmp *dummy; - - *data_tmp = *utmp_data; - utmp_data = data_tmp; - - if (getutid_r (id, &dummy, utmp_data) < 0 && errno != ESRCH) - return -1; - } -#endif - - /* Try to lock the file. */ - if (flock (utmp_data->ut_fd, LOCK_EX | LOCK_NB) < 0 && errno != ENOSYS) - { - /* Oh, oh. The file is already locked. Wait a bit and try again. */ - sleep (1); - - /* This time we ignore the error. */ - (void) flock (utmp_data->ut_fd, LOCK_EX | LOCK_NB); - } - - /* Find out how large the file is. */ - result = fstat (utmp_data->ut_fd, &st); - - if (result >= 0) - /* Position file correctly. */ - if (utmp_data->loc_utmp < (off_t) sizeof (struct utmp) - || (off_t) (utmp_data->loc_utmp - sizeof (struct utmp)) > st.st_size) - /* Not located at any valid entry. Add at the end. */ - { - result = lseek (utmp_data->ut_fd, 0L, SEEK_END); - if (result >= 0) - /* Where we'll be if the write succeeds. */ - utmp_data->loc_utmp = st.st_size + sizeof (struct utmp); - } - else - result = - lseek (utmp_data->ut_fd, utmp_data->loc_utmp - sizeof (struct utmp), - SEEK_SET); - - if (result >= 0) - /* Write the new data. */ - if (write (utmp_data->ut_fd, id, sizeof (struct utmp)) - != sizeof (struct utmp)) - { - /* If we appended a new record this is only partially written. - Remove it. */ - if (utmp_data->loc_utmp > st.st_size) - { - (void) ftruncate (utmp_data->ut_fd, st.st_size); - utmp_data->loc_utmp = st.st_size; - } - - result = -1; - } - - /* And unlock the file. */ - (void) flock (utmp_data->ut_fd, LOCK_UN); - - return result; -} -weak_alias (__pututline_r, pututline_r) diff --git a/login/setutent.c b/login/setutent.c deleted file mode 100644 index 32d2f8c1f7..0000000000 --- a/login/setutent.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C 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. - -The GNU C 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 the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <utmp.h> - -/* Global variable with values for non-reentrent functions. If must - be initialized so that field `ut_fd' is set to -1. */ -struct utmp_data __utmp_data = { ut_fd: -1 }; - - -void -setutent (void) -{ - __setutent_r (&__utmp_data); -} diff --git a/login/setutent_r.c b/login/setutent_r.c deleted file mode 100644 index 46700e700f..0000000000 --- a/login/setutent_r.c +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C 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. - -The GNU C 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 the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <utmp.h> - -/* This is the default name. */ -static const char default_utmp_name[] = _PATH_UTMP; - -/* Current file name. */ -static const char *utmp_file_name = (const char *) default_utmp_name; - - -void -__setutent_r (struct utmp_data *utmp_data) -{ - /* Before the UTMP_DATA is used before the first time the UT_FD - field must be set to -1. */ - if (utmp_data->ut_fd == -1) - { - utmp_data->ut_fd = open (utmp_file_name, O_RDWR); - if (utmp_data->ut_fd == -1) - { - /* Hhm, read-write access did not work. Try read-only. */ - utmp_data->ut_fd = open (utmp_file_name, O_RDONLY); - if (utmp_data->ut_fd == -1) - { - perror (_("while opening UTMP file")); - return; - } - } - } - - /* Remember we are at beginning of file. */ - utmp_data->loc_utmp = 0; -#if _HAVE_UT_TYPE - 0 - utmp_data->ubuf.ut_type = UT_UNKNOWN; -#endif -} -weak_alias (__setutent_r, setutent_r) - - -int -__utmpname (const char *file) -{ - char *fname = __strdup (file); - if (fname == NULL) - return 0; - - if (utmp_file_name != default_utmp_name) - free ((void *) utmp_file_name); - - utmp_file_name = fname; - - return 1; -} -weak_alias (__utmpname, utmpname) |