projects
/
debian
/
pax
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch from Brian Carlson for Debian
[debian/pax]
/
options.c
diff --git
a/options.c
b/options.c
index 4cc16d723e888b56a24f00739bfa9493cbfbe525..36291d1e27a64b4d24bd322aa518b4676fb68a67 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-74,7
+74,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 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 *
bsd_
getline(FILE *fp);
static void pax_options(int, char **);
static void pax_usage(void);
static void tar_options(int, char **);
static void pax_options(int, char **);
static void pax_usage(void);
static void tar_options(int, char **);
@@
-884,7
+884,7
@@
tar_options(int argc, char **argv)
paxwarn(1, "Unable to open file '%s' for read", file);
tar_usage();
}
paxwarn(1, "Unable to open file '%s' for read", file);
tar_usage();
}
- while ((str = getline(fp)) != NULL) {
+ while ((str =
bsd_
getline(fp)) != NULL) {
if (pat_add(str, dir) < 0)
tar_usage();
sawpat = 1;
if (pat_add(str, dir) < 0)
tar_usage();
sawpat = 1;
@@
-963,7
+963,7
@@
tar_options(int argc, char **argv)
paxwarn(1, "Unable to open file '%s' for read", file);
tar_usage();
}
paxwarn(1, "Unable to open file '%s' for read", file);
tar_usage();
}
- while ((str = getline(fp)) != NULL) {
+ while ((str =
bsd_
getline(fp)) != NULL) {
if (ftree_add(str, 0) < 0)
tar_usage();
}
if (ftree_add(str, 0) < 0)
tar_usage();
}
@@
-1185,7
+1185,7
@@
cpio_options(int argc, char **argv)
paxwarn(1, "Unable to open file '%s' for read", optarg);
cpio_usage();
}
paxwarn(1, "Unable to open file '%s' for read", optarg);
cpio_usage();
}
- while ((str = getline(fp)) != NULL) {
+ while ((str =
bsd_
getline(fp)) != NULL) {
pat_add(str, NULL);
}
fclose(fp);
pat_add(str, NULL);
}
fclose(fp);
@@
-1284,7
+1284,7
@@
cpio_options(int argc, char **argv)
* no read errors allowed on updates/append operation!
*/
maxflt = 0;
* no read errors allowed on updates/append operation!
*/
maxflt = 0;
- while ((str = getline(stdin)) != NULL) {
+ while ((str =
bsd_
getline(stdin)) != NULL) {
ftree_add(str, 0);
}
if (getline_error) {
ftree_add(str, 0);
}
if (getline_error) {
@@
-1461,7
+1461,7
@@
str_offt(char *val)
if ((num == LONG_MAX) || (num <= 0) || (expr == val))
# else
num = strtoq(val, &expr, 0);
if ((num == LONG_MAX) || (num <= 0) || (expr == val))
# else
num = strtoq(val, &expr, 0);
- if ((num ==
QUAD
_MAX) || (num <= 0) || (expr == val))
+ if ((num ==
LLONG
_MAX) || (num <= 0) || (expr == val))
# endif
return(0);
# endif
return(0);
@@
-1513,7
+1513,7
@@
str_offt(char *val)
}
char *
}
char *
-getline(FILE *f)
+
bsd_
getline(FILE *f)
{
char *name, *temp;
size_t len;
{
char *name, *temp;
size_t len;