diff options
| -rw-r--r-- | lib/dup-safer.c | 62 | ||||
| -rw-r--r-- | lib/fopen-safer.c | 76 | ||||
| -rw-r--r-- | lib/stdio-safer.h | 9 | ||||
| -rw-r--r-- | lib/unistd-safer.h | 9 |
4 files changed, 156 insertions, 0 deletions
diff --git a/lib/dup-safer.c b/lib/dup-safer.c new file mode 100644 index 000000000..f72fd845f --- /dev/null +++ b/lib/dup-safer.c @@ -0,0 +1,62 @@ +/* Invoke dup, but avoid some glitches. + Copyright (C) 2001 Free Software Foundation, Inc. + + This program 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 program 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 program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Written by Paul Eggert. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#include <errno.h> +#ifndef errno +extern int errno; +#endif + +#if HAVE_FCNTL_H +# include <fcntl.h> +#endif + +#if HAVE_UNISTD_H +# include <unistd.h> +#endif +#ifndef STDERR_FILENO +# define STDERR_FILENO 2 +#endif + +#include <unistd-safer.h> + +/* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or + STDERR_FILENO. */ + +int +dup_safer (int fd) +{ +#ifdef F_DUPFD + return fcntl (fd, F_DUPFD, STDERR_FILENO + 1); +#else + int f = dup (fd); + if (0 <= f && f <= STDERR_FILENO) + { + int f1 = dup_safer (f); + int e = errno; + close (f); + errno = e; + f = f1; + } + return f; +#endif +} diff --git a/lib/fopen-safer.c b/lib/fopen-safer.c new file mode 100644 index 000000000..6825f9b9f --- /dev/null +++ b/lib/fopen-safer.c @@ -0,0 +1,76 @@ +/* Invoke fopen, but avoid some glitches. + Copyright (C) 2001 Free Software Foundation, Inc. + + This program 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 program 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 program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Written by Paul Eggert. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + +#if HAVE_UNISTD_H +# include <unistd.h> +#endif +#include <unistd-safer.h> + +#ifndef STDERR_FILENO +# define STDERR_FILENO 2 +#endif + +#include <errno.h> +#ifndef errno +extern int errno; +#endif + +#include <stdio.h> +#include <stdio-safer.h> + +/* Like fopen, but do not return stdin, stdout, or stderr. */ + +FILE * +fopen_safer (char const *file, char const *mode) +{ + FILE *fp = fopen (file, mode); + + if (fp) + { + int fd = fileno (fp); + + if (0 <= fd && fd <= STDERR_FILENO) + { + int f = dup_safer (fd); + + if (f < 0) + { + int e = errno; + fclose (fp); + errno = e; + return NULL; + } + + if (fclose (fp) != 0 + || ! (fp = fdopen (f, mode))) + { + int e = errno; + close (f); + errno = e; + return NULL; + } + } + } + + return fp; +} diff --git a/lib/stdio-safer.h b/lib/stdio-safer.h new file mode 100644 index 000000000..bd5cbd8da --- /dev/null +++ b/lib/stdio-safer.h @@ -0,0 +1,9 @@ +#ifndef PARAMS +# if defined PROTOTYPES || (defined __STDC__ && __STDC__) +# define PARAMS(Args) Args +# else +# define PARAMS(Args) () +# endif +#endif + +FILE *fopen_safer PARAMS ((char const *, char const *)); diff --git a/lib/unistd-safer.h b/lib/unistd-safer.h new file mode 100644 index 000000000..1b6a0f761 --- /dev/null +++ b/lib/unistd-safer.h @@ -0,0 +1,9 @@ +#ifndef PARAMS +# if defined PROTOTYPES || (defined __STDC__ && __STDC__) +# define PARAMS(Args) Args +# else +# define PARAMS(Args) () +# endif +#endif + +int dup_safer PARAMS ((int)); |