#ifndef lint
static const char rcsid[] =
- "$Id: main.c,v 1.19 2000/03/02 13:33:00 stelian Exp $";
+ "$Id: main.c,v 1.21 2000/03/03 11:43:35 stelian Exp $";
#endif /* not lint */
#include <sys/param.h>
exit(X_STARTUP);
}
disk = *argv++;
- if (strlen(disk) > MAXPATHLEN) {
+ if (strlen(disk) >= MAXPATHLEN) {
(void)fprintf(stderr, "Disk or filesystem name too long: %s\n", disk);
exit(X_STARTUP);
}
if (dt != NULL) {
char name[MAXPATHLEN];
(void)strncpy(spcl.c_dev, dt->fs_spec, NAMELEN);
- (void)sprintf(name, "%s (dir %s)",
+ (void)snprintf(name, sizeof(name), "%s (dir %s)",
dt->fs_file, directory);
(void)strncpy(spcl.c_filesys, name, NAMELEN);
disk = rawname(dt->fs_spec);
usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char));
dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
- tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
+ tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
nonodump = spcl.c_level < honorlevel;
}
if (sizest) {
- printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+ printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
exit(X_FINOK);
} /* stop here for size estimate */
if (pipeout || unlimited) {
- tapesize += 10; /* 10 trailer blocks */
+ tapesize += 11; /* 10 trailer blocks + 1 map header */
msg("estimated %ld tape blocks.\n", tapesize);
} else {
double fetapes;