12345678910111213141516171819202122232425262728293031323334 |
- $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- --- util-linux-2.12r.orig/text-utils/parse.c 2002-03-09 00:07:00.000000000 +0100
- +++ util-linux-2.12r/text-utils/parse.c 2008-10-16 12:51:11.000000000 +0200
- @@ -64,7 +64,7 @@ void addfile(char *name)
- exit(1);
- }
- while (fgets(buf, sizeof(buf), fp)) {
- - if ((p = index(buf, '\n')) == NULL) {
- + if ((p = strchr(buf, '\n')) == NULL) {
- (void)fprintf(stderr, _("hexdump: line too long.\n"));
- while ((ch = getchar()) != '\n' && ch != EOF);
- continue;
- @@ -171,7 +171,7 @@ int size(FS *fs)
- * skip any special chars -- save precision in
- * case it's a %s format.
- */
- - while (index(spec + 1, *++fmt));
- + while (strchr(spec + 1, *++fmt));
- if (*fmt == '.' && isdigit((unsigned char)*++fmt)) {
- prec = atoi(fmt);
- while (isdigit((unsigned char)*++fmt));
- @@ -244,10 +244,10 @@ void rewrite(FS *fs)
- if (fu->bcnt) {
- sokay = USEBCNT;
- /* skip to conversion character */
- - for (++p1; index(spec, *p1); ++p1);
- + for (++p1; strchr(spec, *p1); ++p1);
- } else {
- /* skip any special chars, field width */
- - while (index(spec + 1, *++p1));
- + while (strchr(spec + 1, *++p1));
- if (*p1 == '.' &&
- isdigit((unsigned char)*++p1)) {
- sokay = USEPREC;
|