#undef USE_OLD_CTIME
#include "system.h"
+#include <quotearg.h>
#include <ctype.h>
#include <time.h>
struct stat current_stat; /* stat struct corresponding */
enum archive_format current_format; /* recognized format */
+static uintmax_t from_oct PARAMS ((const char *, size_t, const char *, uintmax_t));
+
+
/*-----------------------------------.
| Main loop for reading an archive. |
`-----------------------------------*/
long unsigned_sum; /* the POSIX one :-) */
long signed_sum; /* the Sun one :-( */
long recorded_sum;
+ uintmax_t parsed_sum;
char *p;
union block *header;
char **longp;
if (!header)
return HEADER_END_OF_FILE;
- recorded_sum = UINTMAX_FROM_OCT (header->header.chksum);
+ parsed_sum = from_oct (header->header.chksum,
+ sizeof header->header.chksum,
+ (char *) 0, TYPE_MAXIMUM (long));
+ if (parsed_sum == (uintmax_t) -1)
+ return HEADER_FAILURE;
+ recorded_sum = parsed_sum;
unsigned_sum = 0;
signed_sum = 0;
p = header->buffer;
{
if (digs == 0)
{
- ERROR ((0, 0, _("Blanks in header where octal %s value expected"),
- type));
+ if (type)
+ ERROR ((0, 0, _("Blanks in header where octal %s value expected"),
+ type));
return -1;
}
if (!ISSPACE (*where))
if (digs != 0 && *where && !ISSPACE (*where))
{
- ERROR ((0, 0, _("Header contains `%.*s' where octal %s value expected"),
- (int) digs0, where0, type));
+ if (type)
+ {
+ char buf[1000]; /* Big enough to represent any header. */
+ static struct quoting_options *o;
+
+ if (!o)
+ {
+ o = clone_quoting_options ((struct quoting_options *) 0);
+ set_quoting_style (o, escape_quoting_style);
+ }
+
+ quotearg_buffer (buf, sizeof buf, where0, digs0, o);
+ ERROR ((0, 0,
+ _("Header contains \"%.*s\" where octal %s value expected"),
+ (int) sizeof buf, buf, type));
+ }
+
return -1;
}
return value;
out_of_range:
- ERROR ((0, 0, _("Octal value `%.*s' is out of range for %s"),
- (int) digs0, where0, type));
+ if (type)
+ ERROR ((0, 0, _("Octal value `%.*s' is out of range for %s"),
+ (int) digs0, where0, type));
return -1;
}
gid_t
gid_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "gid_t", (uintmax_t) GID_MAX);
+ return from_oct (p, s, "gid_t", (uintmax_t) TYPE_MAXIMUM (gid_t));
}
major_t
major_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "major_t", (uintmax_t) MAJOR_MAX);
+ return from_oct (p, s, "major_t", (uintmax_t) TYPE_MAXIMUM (major_t));
}
minor_t
minor_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "minor_t", (uintmax_t) MINOR_MAX);
+ return from_oct (p, s, "minor_t", (uintmax_t) TYPE_MAXIMUM (minor_t));
}
mode_t
mode_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "mode_t", (uintmax_t) MODE_MAX);
+ return from_oct (p, s, "mode_t", (uintmax_t) TYPE_MAXIMUM (mode_t));
}
off_t
off_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "off_t", (uintmax_t) OFF_MAX);
+ return from_oct (p, s, "off_t", (uintmax_t) TYPE_MAXIMUM (off_t));
}
size_t
size_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "size_t", (uintmax_t) SIZE_MAX);
+ return from_oct (p, s, "size_t", (uintmax_t) TYPE_MAXIMUM (size_t));
}
time_t
time_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "time_t", (uintmax_t) TIME_MAX);
+ return from_oct (p, s, "time_t", (uintmax_t) TYPE_MAXIMUM (time_t));
}
uid_t
uid_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "uid_t", (uintmax_t) UID_MAX);
+ return from_oct (p, s, "uid_t", (uintmax_t) TYPE_MAXIMUM (uid_t));
}
uintmax_t
uintmax_from_oct (const char *p, size_t s)
{
- return from_oct (p, s, "uintmax_t", UINTMAX_MAX);
+ return from_oct (p, s, "uintmax_t", TYPE_MAXIMUM (uintmax_t));
}
{
char modes[11];
char *timestamp;
- char uform[11], gform[11]; /* these hold formatted ints */
+ /* These hold formatted ints. */
+ char uform[UINTMAX_STRSIZE_BOUND], gform[UINTMAX_STRSIZE_BOUND];
char *user, *group;
char size[2 * UINTMAX_STRSIZE_BOUND];
/* holds formatted size or major,minor */