diff options
| -rw-r--r-- | lib/fcntl--.h | 25 | ||||
| -rw-r--r-- | lib/fcntl-safer.h | 21 | ||||
| -rw-r--r-- | lib/fd-reopen.c | 46 | ||||
| -rw-r--r-- | lib/fd-reopen.h | 23 | ||||
| -rw-r--r-- | lib/mkstemp-safer.c | 33 | ||||
| -rw-r--r-- | lib/open-safer.c | 47 | ||||
| -rw-r--r-- | lib/stdio--.h | 25 | ||||
| -rw-r--r-- | lib/stdlib--.h | 25 | ||||
| -rw-r--r-- | lib/stdlib-safer.h | 21 | ||||
| -rw-r--r-- | lib/unistd--.h | 25 | ||||
| -rw-r--r-- | m4/fcntl-safer.m4 | 11 | ||||
| -rw-r--r-- | m4/stdlib-safer.m4 | 11 |
12 files changed, 313 insertions, 0 deletions
diff --git a/lib/fcntl--.h b/lib/fcntl--.h new file mode 100644 index 000000000..4d8e84959 --- /dev/null +++ b/lib/fcntl--.h @@ -0,0 +1,25 @@ +/* Like fcntl.h, but redefine some names to avoid glitches. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include <fcntl.h> +#include "fcntl-safer.h" + +#undef open +#define open open_safer diff --git a/lib/fcntl-safer.h b/lib/fcntl-safer.h new file mode 100644 index 000000000..8fc564f81 --- /dev/null +++ b/lib/fcntl-safer.h @@ -0,0 +1,21 @@ +/* Invoke fcntl-like functions, but avoid some glitches. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +int open_safer (char const *, int, ...); diff --git a/lib/fd-reopen.c b/lib/fd-reopen.c new file mode 100644 index 000000000..a33d23d45 --- /dev/null +++ b/lib/fd-reopen.c @@ -0,0 +1,46 @@ +/* Invoke open, but return either a desired file descriptor or -1. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include "fd-reopen.h" + +#include <errno.h> +#include <fcntl.h> + +/* Open a file to a particular file descriptor. This is like standard + `open', except it always returns DESIRED_FD if successful. */ + +int +fd_reopen (int desired_fd, char const *file, int flags, mode_t mode) +{ + int fd; + + close (desired_fd); + fd = open (file, flags, mode); + if (fd == desired_fd || fd < 0) + return fd; + else + { + int fd2 = fcntl (fd, F_DUPFD, desired_fd); + int saved_errno = errno; + close (fd); + errno = saved_errno; + return fd2; + } +} diff --git a/lib/fd-reopen.h b/lib/fd-reopen.h new file mode 100644 index 000000000..af4bcfeb4 --- /dev/null +++ b/lib/fd-reopen.h @@ -0,0 +1,23 @@ +/* Invoke open, but return either a desired file descriptor or -1. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include <sys/types.h> + +int fd_reopen (int, char const *, int, mode_t); diff --git a/lib/mkstemp-safer.c b/lib/mkstemp-safer.c new file mode 100644 index 000000000..c231bffe3 --- /dev/null +++ b/lib/mkstemp-safer.c @@ -0,0 +1,33 @@ +/* Invoke mkstemp, but avoid some glitches. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include "stdlib-safer.h" + +#include <stdlib.h> +#include "unistd-safer.h" + +/* Like mkstemp, but do not return STDIN_FILENO, STDOUT_FILENO, or + STDERR_FILENO. */ + +int +mkstemp_safer (char *template) +{ + return fd_safer (mkstemp (template)); +} diff --git a/lib/open-safer.c b/lib/open-safer.c new file mode 100644 index 000000000..79ce8d563 --- /dev/null +++ b/lib/open-safer.c @@ -0,0 +1,47 @@ +/* Invoke open, but avoid some glitches. + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include "fcntl-safer.h" + +#include <fcntl.h> +#include <stdarg.h> +#include "unistd-safer.h" + +int +open_safer (char const *file, int flags, ...) +{ + mode_t mode = 0; + + if (flags & O_CREAT) + { + va_list ap; + va_start (ap, flags); + + /* Assume mode_t promotes to int if and only if it is smaller. + This assumption isn't guaranteed by the C standard, but we + don't know of any real-world counterexamples. */ + mode = (sizeof (mode_t) < sizeof (int) + ? va_arg (ap, int) + : va_arg (ap, mode_t)); + + va_end (ap); + } + + return fd_safer (open (file, flags, mode)); +} diff --git a/lib/stdio--.h b/lib/stdio--.h new file mode 100644 index 000000000..b2765fd52 --- /dev/null +++ b/lib/stdio--.h @@ -0,0 +1,25 @@ +/* Like stdio.h, but redefine some names to avoid glitches. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include <stdio.h> +#include "stdio-safer.h" + +#undef fopen +#define fopen fopen_safer diff --git a/lib/stdlib--.h b/lib/stdlib--.h new file mode 100644 index 000000000..c12d11de6 --- /dev/null +++ b/lib/stdlib--.h @@ -0,0 +1,25 @@ +/* Like stdlib.h, but redefine some names to avoid glitches. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include <stdlib.h> +#include "stdlib-safer.h" + +#undef mkstemp +#define mkstemp mkstemp_safer diff --git a/lib/stdlib-safer.h b/lib/stdlib-safer.h new file mode 100644 index 000000000..8b1a7e11e --- /dev/null +++ b/lib/stdlib-safer.h @@ -0,0 +1,21 @@ +/* Invoke stdlib.h functions, but avoid some glitches. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +int mkstemp_safer (char *); diff --git a/lib/unistd--.h b/lib/unistd--.h new file mode 100644 index 000000000..14b6e15cc --- /dev/null +++ b/lib/unistd--.h @@ -0,0 +1,25 @@ +/* Like unistd.h, but redefine some names to avoid glitches. + + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* Written by Paul Eggert. */ + +#include <unistd.h> +#include "unistd-safer.h" + +#undef dup +#define dup dup_safer diff --git a/m4/fcntl-safer.m4 b/m4/fcntl-safer.m4 new file mode 100644 index 000000000..465e640f9 --- /dev/null +++ b/m4/fcntl-safer.m4 @@ -0,0 +1,11 @@ +# fcntl-safer.m4 serial 1 +dnl Copyright (C) 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FCNTL_SAFER], +[ + AC_LIBSOURCES([open-safer.c, fcntl-safer.h]) + AC_LIBOBJ([open-safer]) +]) diff --git a/m4/stdlib-safer.m4 b/m4/stdlib-safer.m4 new file mode 100644 index 000000000..fbbaecb74 --- /dev/null +++ b/m4/stdlib-safer.m4 @@ -0,0 +1,11 @@ +# stdlib-safer.m4 serial 1 +dnl Copyright (C) 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_STDLIB_SAFER], +[ + AC_LIBSOURCES([mkstemp-safer.c, stdlib-safer.h]) + AC_LIBOBJ([mkstemp-safer]) +]) |