mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 07:10:06 +00:00
f65fd747b4
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.
242 lines
6.2 KiB
C
242 lines
6.2 KiB
C
/*
|
|
Copyright (C) 1993 Free Software Foundation
|
|
|
|
This file is part of the GNU IO Library. This library is free
|
|
software; you can redistribute it and/or modify it under the
|
|
terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2, 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this library; see the file COPYING. If not, write to the Free
|
|
Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
As a special exception, if you link this library with files
|
|
compiled with a GNU compiler to produce an executable, this does not cause
|
|
the resulting executable to be covered by the GNU General Public License.
|
|
This exception does not however invalidate any other reasons why
|
|
the executable file might be covered by the GNU General Public License. */
|
|
|
|
/* written by Per Bothner (bothner@cygnus.com) */
|
|
|
|
#ifndef _POSIX_SOURCE
|
|
# define _POSIX_SOURCE
|
|
#endif
|
|
#include "libioP.h"
|
|
#if _IO_HAVE_SYS_WAIT
|
|
#include <signal.h>
|
|
#include <unistd.h>
|
|
#ifdef __STDC__
|
|
#include <stdlib.h>
|
|
#endif
|
|
#ifdef _LIBC
|
|
# include <unistd.h>
|
|
#endif
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
|
|
#ifndef _IO_fork
|
|
#define _IO_fork vfork /* defined in libiberty, if needed */
|
|
extern _IO_pid_t _IO_fork __P ((void));
|
|
#endif
|
|
|
|
#endif /* _IO_HAVE_SYS_WAIT */
|
|
|
|
#ifndef _IO_pipe
|
|
#define _IO_pipe pipe
|
|
extern int _IO_pipe __P ((int des[2]));
|
|
#endif
|
|
|
|
#ifndef _IO_dup2
|
|
#define _IO_dup2 dup2
|
|
extern int _IO_dup2 __P ((int fd, int fd2));
|
|
#endif
|
|
|
|
#ifndef _IO_waitpid
|
|
#define _IO_waitpid waitpid
|
|
#endif
|
|
|
|
#ifndef _IO_execl
|
|
#define _IO_execl execl
|
|
#endif
|
|
#ifndef _IO__exit
|
|
#define _IO__exit _exit
|
|
#endif
|
|
|
|
struct _IO_proc_file
|
|
{
|
|
struct _IO_FILE_plus file;
|
|
/* Following fields must match those in class procbuf (procbuf.h) */
|
|
_IO_pid_t pid;
|
|
struct _IO_proc_file *next;
|
|
};
|
|
typedef struct _IO_proc_file _IO_proc_file;
|
|
|
|
static struct _IO_proc_file *proc_file_chain = NULL;
|
|
|
|
_IO_FILE *
|
|
DEFUN(_IO_proc_open, (fp, command, mode),
|
|
_IO_FILE* fp AND const char *command AND const char *mode)
|
|
{
|
|
#if _IO_HAVE_SYS_WAIT
|
|
volatile int read_or_write;
|
|
volatile int parent_end, child_end;
|
|
int pipe_fds[2];
|
|
_IO_pid_t child_pid;
|
|
if (_IO_file_is_open(fp))
|
|
return NULL;
|
|
if (_IO_pipe(pipe_fds) < 0)
|
|
return NULL;
|
|
if (mode[0] == 'r')
|
|
{
|
|
parent_end = pipe_fds[0];
|
|
child_end = pipe_fds[1];
|
|
read_or_write = _IO_NO_WRITES;
|
|
}
|
|
else
|
|
{
|
|
parent_end = pipe_fds[1];
|
|
child_end = pipe_fds[0];
|
|
read_or_write = _IO_NO_READS;
|
|
}
|
|
((_IO_proc_file*)fp)->pid = child_pid = _IO_fork();
|
|
if (child_pid == 0)
|
|
{
|
|
int child_std_end = mode[0] == 'r' ? 1 : 0;
|
|
_IO_close(parent_end);
|
|
if (child_end != child_std_end)
|
|
{
|
|
_IO_dup2(child_end, child_std_end);
|
|
_IO_close(child_end);
|
|
}
|
|
/* Posix.2: "popen() shall ensure that any streams from previous
|
|
popen() calls that remain open in the parent process are closed
|
|
in the new child process." */
|
|
while (proc_file_chain)
|
|
{
|
|
_IO_close (_IO_fileno ((_IO_FILE *) proc_file_chain));
|
|
proc_file_chain = proc_file_chain->next;
|
|
}
|
|
|
|
_IO_execl("/bin/sh", "sh", "-c", command, (char *) 0);
|
|
_IO__exit(127);
|
|
}
|
|
_IO_close(child_end);
|
|
if (child_pid < 0)
|
|
{
|
|
_IO_close(parent_end);
|
|
return NULL;
|
|
}
|
|
_IO_fileno(fp) = parent_end;
|
|
|
|
/* Link into proc_file_chain. */
|
|
((_IO_proc_file*)fp)->next = proc_file_chain;
|
|
proc_file_chain = (_IO_proc_file*)fp;
|
|
|
|
_IO_mask_flags (fp, read_or_write, _IO_NO_READS|_IO_NO_WRITES);
|
|
return fp;
|
|
#else /* !_IO_HAVE_SYS_WAIT */
|
|
return NULL;
|
|
#endif
|
|
}
|
|
|
|
_IO_FILE *
|
|
DEFUN(_IO_popen, (command, mode),
|
|
const char *command AND const char *mode)
|
|
{
|
|
struct locked_FILE
|
|
{
|
|
struct _IO_proc_file fpx;
|
|
#ifdef _IO_MTSAFE_IO
|
|
_IO_lock_t lock;
|
|
#endif
|
|
} *new_f;
|
|
_IO_FILE *fp;
|
|
|
|
new_f = (struct locked_FILE *) malloc (sizeof (struct locked_FILE));
|
|
if (new_f == NULL)
|
|
return NULL;
|
|
#ifdef _IO_MTSAFE_IO
|
|
new_f->fpx.file.file._lock = &new_f->lock;
|
|
#endif
|
|
fp = (_IO_FILE*)&new_f->fpx;
|
|
_IO_init(fp, 0);
|
|
_IO_JUMPS(fp) = &_IO_proc_jumps;
|
|
_IO_file_init(fp);
|
|
#if !_IO_UNIFIED_JUMPTABLES
|
|
((struct _IO_FILE_plus*)fp)->vtable = NULL;
|
|
#endif
|
|
if (_IO_proc_open (fp, command, mode) != NULL)
|
|
return fp;
|
|
free (new_f);
|
|
return NULL;
|
|
}
|
|
|
|
strong_alias (_IO_popen, popen);
|
|
|
|
int
|
|
DEFUN(_IO_proc_close, (fp),
|
|
_IO_FILE *fp)
|
|
{
|
|
/* This is not name-space clean. FIXME! */
|
|
#if _IO_HAVE_SYS_WAIT
|
|
int wstatus;
|
|
_IO_proc_file **ptr = &proc_file_chain;
|
|
_IO_pid_t wait_pid;
|
|
int status = -1;
|
|
|
|
/* Unlink from proc_file_chain. */
|
|
for ( ; *ptr != NULL; ptr = &(*ptr)->next)
|
|
{
|
|
if (*ptr == (_IO_proc_file*)fp)
|
|
{
|
|
*ptr = (*ptr)->next;
|
|
status = 0;
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (status < 0 || _IO_close(_IO_fileno(fp)) < 0)
|
|
return -1;
|
|
/* POSIX.2 Rationale: "Some historical implementations either block
|
|
or ignore the signals SIGINT, SIGQUIT, and SIGHUP while waiting
|
|
for the child process to terminate. Since this behavior is not
|
|
described in POSIX.2, such implementations are not conforming." */
|
|
do
|
|
{
|
|
wait_pid = _IO_waitpid (((_IO_proc_file*)fp)->pid, &wstatus, 0);
|
|
} while (wait_pid == -1 && errno == EINTR);
|
|
if (wait_pid == -1)
|
|
return -1;
|
|
return wstatus;
|
|
#else /* !_IO_HAVE_SYS_WAIT */
|
|
return -1;
|
|
#endif
|
|
}
|
|
|
|
struct _IO_jump_t _IO_proc_jumps = {
|
|
JUMP_INIT_DUMMY,
|
|
JUMP_INIT(finish, _IO_file_finish),
|
|
JUMP_INIT(overflow, _IO_file_overflow),
|
|
JUMP_INIT(underflow, _IO_file_underflow),
|
|
JUMP_INIT(uflow, _IO_default_uflow),
|
|
JUMP_INIT(pbackfail, _IO_default_pbackfail),
|
|
JUMP_INIT(xsputn, _IO_file_xsputn),
|
|
JUMP_INIT(xsgetn, _IO_default_xsgetn),
|
|
JUMP_INIT(seekoff, _IO_file_seekoff),
|
|
JUMP_INIT(seekpos, _IO_default_seekpos),
|
|
JUMP_INIT(setbuf, _IO_file_setbuf),
|
|
JUMP_INIT(sync, _IO_file_sync),
|
|
JUMP_INIT(doallocate, _IO_file_doallocate),
|
|
JUMP_INIT(read, _IO_file_read),
|
|
JUMP_INIT(write, _IO_file_write),
|
|
JUMP_INIT(seek, _IO_file_seek),
|
|
JUMP_INIT(close, _IO_proc_close),
|
|
JUMP_INIT(stat, _IO_file_stat)
|
|
};
|