This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.10.90-27-1-g27a4a1d
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 2 Nov 2009 12:17:57 -0000
- Subject: GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.10.90-27-1-g27a4a1d
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, fedora/master has been updated
via 27a4a1d867462f6faeb93bfaf6ced524f428fe39 (commit)
from 587045f460bb324b47dcae7567bf186222538a56 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=27a4a1d867462f6faeb93bfaf6ced524f428fe39
commit 27a4a1d867462f6faeb93bfaf6ced524f428fe39
Author: H.J. Lu <hongjiu.lu@intel.com>
Date: Mon Nov 2 13:15:34 2009 +0100
Avoid multi-arch strchr in tzdata-update
diff --git a/fedora/tzdata-update.c b/fedora/tzdata-update.c
index f94f9a2..988fb55 100644
--- a/fedora/tzdata-update.c
+++ b/fedora/tzdata-update.c
@@ -483,6 +483,15 @@ clean_up:
INTERNAL_SYSCALL (unlink, err, 1, tempfilename);
}
+static char *
+simple_strchr (const char *s, int c)
+{
+ for (; *s != (char) c; ++s)
+ if (*s == '\0')
+ return NULL;
+ return (char *) s;
+}
+
int
main (int argc, char **argv)
{
@@ -508,7 +517,7 @@ main (int argc, char **argv)
while (*p == ' ' || *p == '\t') p++;
if (*p == '"') p++;
char *q = p;
- while (strchr (" \t\n\"", *p) == NULL) p++;
+ while (simple_strchr (" \t\n\"", *p) == NULL) p++;
const char path[] = "/usr/share/zoneinfo/";
if (p - q >= sizeof (zonename) - sizeof (path))
return 0;
@@ -517,7 +526,7 @@ main (int argc, char **argv)
break;
}
}
- p = strchr (p, '\n');
+ p = simple_strchr (p, '\n');
if (p) p++;
}
if (*zonename == '\0')
-----------------------------------------------------------------------
Summary of changes:
fedora/tzdata-update.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources