Use fopen with 'c' mode flag.

diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 1fa7d0e..858d409 100644 (file)
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -357,7 +357,9 @@ internal_function
 read_conf_file (const char *filename, const char *directory, size_t dir_len,
                void **modules, size_t *nmodules)
 {
-  FILE *fp = fopen (filename, "r");
+  /* Note the file is opened with cancellation in the I/O functions
+     disabled.  */
+  FILE *fp = fopen (filename, "rc");
   char *line = NULL;
   size_t line_len = 0;
   static int modcounter;

diff --git a/inet/rcmd.c b/inet/rcmd.c
index 42871f7..ad72108 100644 (file)
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -551,7 +551,7 @@ iruserfopen (const char *file, uid_t okuser)
     cp = _("not regular file");
   else
     {
-      res = fopen (file, "r");
+      res = fopen (file, "rc");
       if (!res)
        cp = _("cannot open");
       else if (__fxstat64 (_STAT_VER, fileno (res), &st) < 0)

diff --git a/inet/ruserpass.c b/inet/ruserpass.c
index e0f1a52..e5b2caf 100644 (file)
--- a/inet/ruserpass.c
+++ b/inet/ruserpass.c
@@ -114,7 +114,7 @@ ruserpass(host, aname, apass)
        buf = alloca (strlen (hdir) + 8);
 
        __stpcpy (__stpcpy (buf, hdir), "/.netrc");
-       cfile = fopen(buf, "r");
+       cfile = fopen(buf, "rc");
        if (cfile == NULL) {
                if (errno != ENOENT)
                        warn("%s", buf);

diff --git a/intl/localealias.c b/intl/localealias.c
index ed8747d..32d05ff 100644 (file)
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -219,7 +219,9 @@ read_alias_file (fname, fname_len)
   memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
 #endif
 
-  fp = fopen (full_fname, "r");
+  /* Note the file is opened with cancellation in the I/O functions
+     disabled.  */
+  fp = fopen (full_fname, "rc");
   freea (full_fname);
   if (fp == NULL)
     return 0;

diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index 6d56cf0..6cdd5f3 100644 (file)
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -280,7 +280,7 @@ mtrace ()
       if (mtb == NULL)
        return;
 
-      mallstream = fopen (mallfile != NULL ? mallfile : "/dev/null", "w");
+      mallstream = fopen (mallfile != NULL ? mallfile : "/dev/null", "wc");
       if (mallstream != NULL)
        {
          /* Make sure we close the file descriptor on exec.  */

diff --git a/misc/getpass.c b/misc/getpass.c
index 70562e5..52dab94 100644 (file)
--- a/misc/getpass.c
+++ b/misc/getpass.c
@@ -56,7 +56,7 @@ getpass (prompt)
   /* Try to write to and read from the terminal if we can.
      If we can't open the terminal, use stderr and stdin.  */
 
-  in = fopen ("/dev/tty", "w+");
+  in = fopen ("/dev/tty", "w+c");
   if (in == NULL)
     {
       in = stdin;

diff --git a/misc/getttyent.c b/misc/getttyent.c
index 1bc82e6..2ff0a7b 100644 (file)
--- a/misc/getttyent.c
+++ b/misc/getttyent.c
@@ -192,7 +192,7 @@ setttyent()
        if (tf) {
                (void)rewind(tf);
                return (1);
-       } else if ((tf = fopen(_PATH_TTYS, "r"))) {
+       } else if ((tf = fopen(_PATH_TTYS, "rc"))) {
                /* We do the locking ourselves.  */
                __fsetlocking (tf, FSETLOCKING_BYCALLER);
                return (1);

diff --git a/misc/getusershell.c b/misc/getusershell.c
index c15b8f6..96ab5c8 100644 (file)
--- a/misc/getusershell.c
+++ b/misc/getusershell.c
@@ -100,7 +100,7 @@ initshells()
        if (strings != NULL)
                free(strings);
        strings = NULL;
-       if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
+       if ((fp = fopen(_PATH_SHELLS, "rc")) == NULL)
                return (char **) okshells;
        if (fstat64(fileno(fp), &statb) == -1) {
                (void)fclose(fp);

diff --git a/misc/mntent_r.c b/misc/mntent_r.c
index 7a39418..9bfe875 100644 (file)
--- a/misc/mntent_r.c
+++ b/misc/mntent_r.c
@@ -1,5 +1,5 @@
 /* Utilities for reading/writing fstab, mtab, etc.
-   Copyright (C) 1995-2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-2000, 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -38,7 +38,12 @@
 FILE *
 __setmntent (const char *file, const char *mode)
 {
-  FILE *result = fopen (file, mode);
+  /* Extend the mode parameter with "c" to disable cancellation in the
+     I/O functions.  */
+  size_t modelen = strlen (mode);
+  char newmode[modelen + 2];
+  memcpy (mempcpy (newmode, mode, modelen), "c", 2);
+  FILE *result = fopen (file, newmode);
 
   if (result != NULL)
     /* We do the locking ourselves.  */

diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 08b8698..b983e34 100644 (file)
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -428,7 +428,7 @@ nss_parse_file (const char *fname)
   size_t len;
 
   /* Open the configuration file.  */
-  fp = fopen (fname, "r");
+  fp = fopen (fname, "rc");
   if (fp == NULL)
     return NULL;
 

diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 40afeb0..cd622ed 100644 (file)
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Mosberger (davidm@azstarnet.com).
 
@@ -425,7 +425,7 @@ do_init (void)
   if (hconf_name == NULL)
     hconf_name = _PATH_HOSTCONF;
 
-  fp = fopen (hconf_name, "r");
+  fp = fopen (hconf_name, "rc");
   if (!fp)
     /* make up something reasonable: */
     _res_hconf.service[_res_hconf.num_services++] = SERVICE_BIND;

diff --git a/resolv/res_init.c b/resolv/res_init.c
index 7b9cf43..61820e6 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -231,7 +231,7 @@ __res_vinit(res_state statp, int preinit) {
        (line[sizeof(name) - 1] == ' ' || \
         line[sizeof(name) - 1] == '\t'))
 
-       if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
+       if ((fp = fopen(_PATH_RESCONF, "rc")) != NULL) {
                /* No threads use this stream.  */
                __fsetlocking (fp, FSETLOCKING_BYCALLER);
            /* read the config file */

diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
index 69dabd1..985a086 100644 (file)
--- a/sysdeps/unix/sysv/linux/getsysstats.c
+++ b/sysdeps/unix/sysv/linux/getsysstats.c
@@ -154,7 +154,7 @@ __get_nprocs ()
       /* The /proc/stat format is more uniform, use it by default.  */
       __stpcpy (__stpcpy (proc_fname, proc_path), "/stat");
 
-      fp = fopen (proc_fname, "r");
+      fp = fopen (proc_fname, "rc");
       if (fp != NULL)
        {
          /* No threads use this stream.  */
@@ -171,7 +171,7 @@ __get_nprocs ()
        {
          __stpcpy (__stpcpy (proc_fname, proc_path), "/cpuinfo");
 
-         fp = fopen (proc_fname, "r");
+         fp = fopen (proc_fname, "rc");
          if (fp != NULL)
            {
              /* No threads use this stream.  */
@@ -209,7 +209,7 @@ __get_nprocs_conf ()
       char *proc_cpuinfo = alloca (strlen (proc_path) + sizeof ("/cpuinfo"));
       __stpcpy (__stpcpy (proc_cpuinfo, proc_path), "/cpuinfo");
 
-      fp = fopen (proc_cpuinfo, "r");
+      fp = fopen (proc_cpuinfo, "rc");
       if (fp != NULL)
        {
          /* No threads use this stream.  */
@@ -249,7 +249,7 @@ phys_pages_info (const char *format)
       char *proc_meminfo = alloca (strlen (proc_path) + sizeof ("/meminfo"));
       __stpcpy (__stpcpy (proc_meminfo, proc_path), "/meminfo");
 
-      fp = fopen (proc_meminfo, "r");
+      fp = fopen (proc_meminfo, "rc");
       if (fp != NULL)
        {
          /* No threads use this stream.  */

diff --git a/time/getdate.c b/time/getdate.c
index 8c9d16f..851efac 100644 (file)
--- a/time/getdate.c
+++ b/time/getdate.c
@@ -1,5 +1,5 @@
 /* Convert a string representation of time to a time value.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
 
@@ -129,7 +129,7 @@ __getdate_r (const char *string, struct tm *tp)
     return 2;
 
   /* Open the template file.  */
-  fp = fopen (datemsk, "r");
+  fp = fopen (datemsk, "rc");
   if (fp == NULL)
     return 2;
 

diff --git a/time/tzfile.c b/time/tzfile.c
index 2d1775b..e2d9f50 100644 (file)
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -148,7 +148,9 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
       file = new;
     }
 
-  f = fopen (file, "r");
+  /* Note the file is opened with cancellation in the I/O functions
+     disabled.  */
+  f = fopen (file, "rc");
   if (f == NULL)
     return;