aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-07-12 00:20:03 +0000
committerRoland McGrath <roland@gnu.org>1996-07-12 00:20:03 +0000
commitadc6ff7f817959b0acf48de1bf0e7a7a6c0b901d (patch)
treea7dcc8f043035c6cbfafce6668d36f03829d83ef
parentddc6fb0c8eb078061490718b78af41d0d77bc568 (diff)
downloadglibc-adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d.tar
glibc-adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d.tar.gz
glibc-adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d.tar.bz2
glibc-adc6ff7f817959b0acf48de1bf0e7a7a6c0b901d.zip
Thu Jul 11 20:09:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* nss/nss_files/files-service.c (getservbyname): Take second arg PROTO and check it. * nss/nss_files/files-XXX.c: Comment fix. Fri Jul 12 01:28:35 1996 Ulrich Drepper <drepper@cygnus.com> * nss/getXXent_r.c (GETFUNC_NAME_STRING): Define with name of reentrant function. (setup): Pass additional argument with function name we are looking for. (SETFUNC_NAME, ENDFUNC_NAME, GETFUNC_NAME): Call setup with new argument {SET,END,GET}FUNC_NAME_STRING. * nss/getXXent.c (GETFUNC_NAME): RESULT must be static because we return a pointer. Thu Jul 11 18:20:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * nss/nss_files/files-parse.c: Add comment about things to #define. * nss/nss_files/files-hosts.c (NEED_H_ERRNO): Define it. * nss/nss_files/files-parse.c (STRING_FIELD): Don't flag NUL before terminator char as an error. * nss/getXXbyYY_r.c (REENTRANT_NAME): Set *H_ERRNOP, not h_errno. Thu Jul 11 03:21:10 1996 Ulrich Drepper <drepper@cygnus.com> * catgets/gencat.c (write_out): Move code to determine new best size out of inner loop. Wed Jul 10 05:24:40 1996 David Mosberger-Tang <davidm@azstarnet.com> * misc/mntent.c: Include <sys/types.h>. (endmntent): Return 1 one success, 0 on failure. (getmntent): Chop newline and ignore empty lines. Mon Jul 8 21:18:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (RESOLVE): New macro, defined differently based on [RTLD_BOOTSTRAP]. (elf_machine_rela): Use it instead of the fn ptr arg directly.
-rw-r--r--ChangeLog47
-rw-r--r--catgets/gencat.c16
-rw-r--r--misc/mntent.c18
-rw-r--r--nss/getXXbyYY_r.c2
-rw-r--r--nss/getXXent.c2
-rw-r--r--nss/nss_files/files-XXX.c3
-rw-r--r--nss/nss_files/files-hosts.c1
-rw-r--r--nss/nss_files/files-parse.c26
-rw-r--r--nss/nss_files/files-service.c9
9 files changed, 100 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index bd2e083ed4..834834797c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+Thu Jul 11 20:09:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
+
+ * nss/nss_files/files-service.c (getservbyname): Take second arg PROTO
+ and check it.
+
+ * nss/nss_files/files-XXX.c: Comment fix.
+
+Fri Jul 12 01:28:35 1996 Ulrich Drepper <drepper@cygnus.com>
+
+ * nss/getXXent_r.c (GETFUNC_NAME_STRING): Define with name
+ of reentrant function.
+ (setup): Pass additional argument with function name we are
+ looking for.
+ (SETFUNC_NAME, ENDFUNC_NAME, GETFUNC_NAME): Call setup with
+ new argument {SET,END,GET}FUNC_NAME_STRING.
+
+ * nss/getXXent.c (GETFUNC_NAME): RESULT must be static because
+ we return a pointer.
+
+Thu Jul 11 18:20:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
+
+ * nss/nss_files/files-parse.c: Add comment about things to #define.
+
+ * nss/nss_files/files-hosts.c (NEED_H_ERRNO): Define it.
+
+ * nss/nss_files/files-parse.c (STRING_FIELD): Don't flag NUL before
+ terminator char as an error.
+
+ * nss/getXXbyYY_r.c (REENTRANT_NAME): Set *H_ERRNOP, not h_errno.
+
+Thu Jul 11 03:21:10 1996 Ulrich Drepper <drepper@cygnus.com>
+
+ * catgets/gencat.c (write_out): Move code to determine new
+ best size out of inner loop.
+
+Wed Jul 10 05:24:40 1996 David Mosberger-Tang <davidm@azstarnet.com>
+
+ * misc/mntent.c: Include <sys/types.h>.
+ (endmntent): Return 1 one success, 0 on failure.
+ (getmntent): Chop newline and ignore empty lines.
+
+Mon Jul 8 21:18:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
+
+ * sysdeps/m68k/dl-machine.h (RESOLVE): New macro, defined
+ differently based on [RTLD_BOOTSTRAP].
+ (elf_machine_rela): Use it instead of the fn ptr arg directly.
+
Tue Jul 9 09:37:55 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* posix/glob.h (__glob_opendir_hook, __glob_readdir_hook,
diff --git a/catgets/gencat.c b/catgets/gencat.c
index 37b73eaf59..9924cb9161 100644
--- a/catgets/gencat.c
+++ b/catgets/gencat.c
@@ -670,17 +670,17 @@ write_out (struct catalog *catalog, const char *output_name,
}
message_run = message_run->next;
}
-
- if (act_depth * act_size <= best_total)
- {
- /* We have found a better solution. */
- best_total = act_depth * act_size;
- best_size = act_size;
- best_depth = act_depth;
- }
set_run = set_run->next;
}
+ if (act_depth * act_size <= best_total)
+ {
+ /* We have found a better solution. */
+ best_total = act_depth * act_size;
+ best_size = act_size;
+ best_depth = act_depth;
+ }
+
++act_size;
}
diff --git a/misc/mntent.c b/misc/mntent.c
index bdc6aaed79..6cf74c2160 100644
--- a/misc/mntent.c
+++ b/misc/mntent.c
@@ -20,6 +20,7 @@ Cambridge, MA 02139, USA. */
#include <mntent.h>
#include <stdio.h>
#include <string.h>
+#include <sys/types.h>
/* Prepare to begin reading and/or writing mount table entries from the
beginning of FILE. MODE is as for `fopen'. */
@@ -33,7 +34,9 @@ setmntent (const char *file, const char *mode)
int
endmntent (FILE *stream)
{
- return fclose (stream);
+ if (fclose (stream) != 0)
+ return 0;
+ return 1;
}
@@ -46,15 +49,21 @@ getmntent (FILE *stream)
static char *buf;
static size_t bufsiz;
static struct mntent m;
+ ssize_t nread;
char *head;
do
{
- if (getline (&buf, &bufsiz, stream) < 0)
+ nread = getline (&buf, &bufsiz, stream);
+ if (nread <= 0)
return NULL;
+ if (buf[nread - 1] == '\n') /* chop newline */
+ buf[nread - 1] = '\0';
+
head = buf + strspn (buf, " \t");
- } while (head[0] == '#'); /* Skip comment lines. */
+ /* skip empty lines and comment lines: */
+ } while (head[0] == '\0' || head[0] == '#');
m.mnt_fsname = strsep (&head, " \t") ?: (char *) "";
if (head)
@@ -66,7 +75,7 @@ getmntent (FILE *stream)
if (head)
head += strspn (head, " \t");
m.mnt_opts = strsep (&head, " \t") ?: (char *) "";
- switch (head ? sscanf (head, " %d %d\n", &m.mnt_freq, &m.mnt_passno) : 0)
+ switch (head ? sscanf (head, " %d %d ", &m.mnt_freq, &m.mnt_passno) : 0)
{
case 0:
m.mnt_freq = 0;
@@ -114,4 +123,3 @@ hasmntopt (const struct mntent *mnt, const char *opt)
return NULL;
}
-
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index 11c4e9f71f..37ad22d045 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -106,7 +106,7 @@ REENTRANT_NAME (ADD_PARAMS, LOOKUP_TYPE *result, char *buffer, int buflen
initialize it. */
if ((_res.options & RES_INIT) == 0 && res_init () == -1)
{
- h_errno = NETDB_INTERNAL;
+ *h_errnop = NETDB_INTERNAL;
return NULL;
}
#endif /* need _res */
diff --git a/nss/getXXent.c b/nss/getXXent.c
index da3712c70f..fd75979c9d 100644
--- a/nss/getXXent.c
+++ b/nss/getXXent.c
@@ -57,7 +57,7 @@ LOOKUP_TYPE *
GETFUNC_NAME (void)
{
static char buffer[BUFLEN];
- LOOKUP_TYPE result;
+ static LOOKUP_TYPE result;
return REENTRANT_GETNAME (&result, buffer, BUFLEN H_ERRNO_VAR);
}
diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index 7fa87c098a..80efd294a9 100644
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -30,7 +30,8 @@ Cambridge, MA 02139, USA. */
DATABASE -- string of the database file's name ("hosts", "passwd").
NEED_H_ERRNO - defined iff an arg `int *herrnop' is used.
- MIDLINE_COMMENTS - defined iff # before \n terminates a database line.
+
+ Also see files-parse.c.
*/
#define ENTNAME_r CONCAT(ENTNAME,_r)
diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c
index bc9eaa39a5..e3d83fec26 100644
--- a/nss/nss_files/files-hosts.c
+++ b/nss/nss_files/files-hosts.c
@@ -31,6 +31,7 @@ Cambridge, MA 02139, USA. */
#define ENTNAME hostent
#define DATABASE "hosts"
+#define NEED_H_ERRNO
#define ENTDATA hostent_data
struct hostent_data
diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c
index 1f3b13886d..c9fb1f81e9 100644
--- a/nss/nss_files/files-parse.c
+++ b/nss/nss_files/files-parse.c
@@ -22,6 +22,18 @@ Cambridge, MA 02139, USA. */
#include <string.h>
#include <stdlib.h>
+/* These symbols are defined by the including source file:
+
+ ENTNAME -- database name of the structure and functions (hostent, pwent).
+ STRUCTURE -- struct name, define only if not ENTNAME (passwd, group).
+ DATABASE -- string of the database file's name ("hosts", "passwd").
+
+ ENTDATA -- if defined, `struct ENTDATA' is used by the parser to store
+ things pointed to by the resultant `struct STRUCTURE'.
+
+ NEED_H_ERRNO - defined iff an arg `int *herrnop' is used.
+
+ Also see files-XXX.c. */
#define CONCAT(a,b) CONCAT1(a,b)
#define CONCAT1(a,b) a##b
@@ -83,13 +95,15 @@ parse_line (char *line, struct STRUCTURE *result, \
#define STRING_FIELD(variable, terminator_p, swallow) \
{ \
variable = line; \
- while (!terminator_p (*line)) \
- if (*++line == '\0') \
- return 0; \
- *line = '\0'; \
- do \
+ while (*line != '\0' && !terminator_p (*line)) \
++line; \
- while (swallow && terminator_p (*line)); \
+ if (*line != '\0') \
+ { \
+ *line = '\0'; \
+ do \
+ ++line; \
+ while (swallow && terminator_p (*line)); \
+ } \
}
#define INT_FIELD(variable, terminator_p, swallow, base, convert) \
diff --git a/nss/nss_files/files-service.c b/nss/nss_files/files-service.c
index 5dea476208..1bd26d1f07 100644
--- a/nss/nss_files/files-service.c
+++ b/nss/nss_files/files-service.c
@@ -40,8 +40,13 @@ LINE_PARSER
#include GENERIC
DB_LOOKUP (servbyname, 1 + strlen (name), (".%s", name),
- LOOKUP_NAME (s_name, s_aliases),
- const char *name)
+ {
+ /* Must match both protocol and name. */
+ if (strcmp (result->s_proto, proto))
+ continue;
+ LOOKUP_NAME (s_name, s_aliases)
+ },
+ const char *name, const char *proto)
DB_LOOKUP (servbyport, 20, ("=%d", port),
{