aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--db2/makedb.c11
-rw-r--r--misc/mkstemp.c3
-rw-r--r--misc/mktemp.c3
-rw-r--r--signal/signal.h8
-rw-r--r--stdio-common/tmpfile.c1
-rw-r--r--stdio-common/tmpfile64.c2
7 files changed, 34 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 095145f991..f7e23fddb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+1998-08-04 16:53 Ulrich Drepper <drepper@cygnus.com>
+
+ * stdio-common/tmpfile.c: Include unistd.h for close prototype.
+ * stdio-common/tmpfile64.c: Likewise.
+
+ * db2/makedb.c: Generate output file with same access permissions
+ the input file has.
+
+ * signal/signal.h: Pretty printing.
+
+1998-08-04 Andreas Jaeger <aj@arthur.rhein-neckar.de>
+
+ * misc/mktemp.c: Add include <stlib.h> for prototype, remove
+ unneccessary includes.
+ * misc/mkstemp.c: Likewise.
+
1998-08-03 16:36 Ulrich Drepper <drepper@cygnus.com>
* catgets/catgets.c: Use mmap/munmap only is _POSIX_MAPPED_FILES
diff --git a/db2/makedb.c b/db2/makedb.c
index d7821036f8..d20befc053 100644
--- a/db2/makedb.c
+++ b/db2/makedb.c
@@ -29,6 +29,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/stat.h>
/* Get libc version number. */
#include "../version.h"
@@ -100,6 +101,7 @@ main (argc, argv)
DB *db_file;
int status;
int remaining;
+ int mode = 0666;
/* Set locale via LC_ALL. */
setlocale (LC_ALL, "");
@@ -157,15 +159,22 @@ main (argc, argv)
input_file = stdin;
else
{
+ struct stat st;
+
input_file = fopen (input_name, "r");
if (input_file == NULL)
error (EXIT_FAILURE, errno, gettext ("cannot open input file `%s'"),
input_name);
+
+ /* Get the access rights from the source file. The output file should
+ have the same. */
+ if (fstat (fileno (input_file), &st) >= 0)
+ mode = st.st_mode & ACCESSPERMS;
}
/* Open output file. This must not be standard output so we don't
handle "-" and "/dev/stdout" special. */
- db_file = dbopen (output_name, O_CREAT | O_RDWR | O_TRUNC, 0666,
+ db_file = dbopen (output_name, O_CREAT | O_RDWR | O_TRUNC, mode,
DB_BTREE, NULL);
if (db_file == NULL)
error (EXIT_FAILURE, errno, gettext ("cannot open output file `%s'"),
diff --git a/misc/mkstemp.c b/misc/mkstemp.c
index 3fa033bd6b..fc911da9a1 100644
--- a/misc/mkstemp.c
+++ b/misc/mkstemp.c
@@ -16,9 +16,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <errno.h>
#include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
diff --git a/misc/mktemp.c b/misc/mktemp.c
index b2abc5d5e0..36b50031b9 100644
--- a/misc/mktemp.c
+++ b/misc/mktemp.c
@@ -16,9 +16,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <errno.h>
#include <stdio.h>
-#include <unistd.h>
+#include <stdlib.h>
/* Generate a unique temporary file name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
diff --git a/signal/signal.h b/signal/signal.h
index 8a37dde0c1..97656d8fd0 100644
--- a/signal/signal.h
+++ b/signal/signal.h
@@ -170,12 +170,12 @@ typedef __sighandler_t sig_t;
#endif /* <signal.h> included. */
-# if !defined __sigset_t_defined \
+#if !defined __sigset_t_defined \
&& ((defined _SIGNAL_H && defined __USE_POSIX) || defined __need_sigset_t)
typedef __sigset_t sigset_t;
-# define __sigset_t_defined 1
-# endif /* `sigset_t' not defined and <signal.h> or need `sigset_t'. */
-# undef __need_sigset_t
+# define __sigset_t_defined 1
+#endif /* `sigset_t' not defined and <signal.h> or need `sigset_t'. */
+#undef __need_sigset_t
#ifdef __USE_POSIX
diff --git a/stdio-common/tmpfile.c b/stdio-common/tmpfile.c
index 488b43b1f7..6b9dfd44b0 100644
--- a/stdio-common/tmpfile.c
+++ b/stdio-common/tmpfile.c
@@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <stdio.h>
+#include <unistd.h>
#ifdef _USE_IN_LIBIO
# define fdopen _IO_new_fdopen
diff --git a/stdio-common/tmpfile64.c b/stdio-common/tmpfile64.c
index 5854f1451d..a7fce66a86 100644
--- a/stdio-common/tmpfile64.c
+++ b/stdio-common/tmpfile64.c
@@ -16,8 +16,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <errno.h>
#include <stdio.h>
+#include <unistd.h>
#ifdef _USE_IN_LIBIO
# define fdopen _IO_new_fdopen