diff options
| author | joerg <joerg@pkgsrc.org> | 2009-08-06 13:54:03 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-08-06 13:54:03 +0000 |
| commit | e207841ddfcdb0a86451aa1e82c0db77084ad6ca (patch) | |
| tree | bc58e82f8744098fb4193615bab8cc38e5c32b07 /archivers | |
| parent | 38ff1f7576c2eea15e2a9a099fe9ee9b603ba342 (diff) | |
| download | pkgsrc-e207841ddfcdb0a86451aa1e82c0db77084ad6ca.tar.gz | |
getline -> get_line
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/pax/files/options.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/archivers/pax/files/options.c b/archivers/pax/files/options.c index e16b989fe70..fd818952f2a 100644 --- a/archivers/pax/files/options.c +++ b/archivers/pax/files/options.c @@ -1,4 +1,4 @@ -/* $NetBSD: options.c,v 1.9 2007/03/08 17:18:18 rillig Exp $ */ +/* $NetBSD: options.c,v 1.10 2009/08/06 13:54:03 joerg Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -48,7 +48,7 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #else -__RCSID("$NetBSD: options.c,v 1.9 2007/03/08 17:18:18 rillig Exp $"); +__RCSID("$NetBSD: options.c,v 1.10 2009/08/06 13:54:03 joerg Exp $"); #endif #endif /* not lint */ @@ -120,7 +120,7 @@ static int no_op(void); static void printflg(unsigned int); static int c_frmt(const void *, const void *); static off_t str_offt(char *); -static char *getline(FILE *fp); +static char *get_line(FILE *fp); static void pax_options(int, char **); static void pax_usage(void); static void tar_options(int, char **); @@ -130,7 +130,7 @@ static void cpio_options(int, char **); static void cpio_usage(void); #endif -/* errors from getline */ +/* errors from get_line */ #define GETLINE_FILE_CORRUPT 1 #define GETLINE_OUT_OF_MEM 2 static int getline_error; @@ -1217,7 +1217,7 @@ tar_options(int argc, char **argv) tty_warn(1, "Unable to open file '%s' for read", file); tar_usage(); } - while ((str = getline(fp)) != NULL) { + while ((str = get_line(fp)) != NULL) { if (dirisnext) { dir = str; dirisnext = 0; @@ -1309,7 +1309,7 @@ tar_options(int argc, char **argv) tty_warn(1, "Unable to open file '%s' for read", file); tar_usage(); } - while ((str = getline(fp)) != NULL) { + while ((str = get_line(fp)) != NULL) { if (dirisnext) { if (ftree_add(str, 1) < 0) tar_usage(); @@ -1621,7 +1621,7 @@ cpio_options(int argc, char **argv) optarg); cpio_usage(); } - while ((str = getline(fp)) != NULL) { + while ((str = get_line(fp)) != NULL) { pat_add(str, NULL); } fclose(fp); @@ -1777,7 +1777,7 @@ cpio_options(int argc, char **argv) * no read errors allowed on updates/append operation! */ maxflt = 0; - while ((str = getline(stdin)) != NULL) { + while ((str = get_line(stdin)) != NULL) { ftree_add(str, 0); } if (getline_error) { @@ -2007,8 +2007,8 @@ str_offt(char *val) return(num); } -char * -getline(FILE *f) +static char * +get_line(FILE *f) { char *name, *temp; size_t len; |