Module Name: src Committed By: tsutsui Date: Thu Dec 28 12:13:56 UTC 2023
Modified Files: src/usr.sbin/makefs: cd9660.c ffs.c makefs.c msdos.c udf.c walk.c src/usr.sbin/makefs/cd9660: cd9660_debug.c cd9660_eltorito.c cd9660_write.c Log Message: Use EXIT_SUCCESS and EXIT_FAILURE where appropriate per style guide. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/makefs/cd9660.c cvs rdiff -u -r1.74 -r1.75 src/usr.sbin/makefs/ffs.c cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/makefs/makefs.c cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/makefs/msdos.c cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/makefs/udf.c cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/makefs/walk.c cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/makefs/cd9660/cd9660_debug.c cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/makefs/cd9660/cd9660_write.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/usr.sbin/makefs/cd9660.c diff -u src/usr.sbin/makefs/cd9660.c:1.59 src/usr.sbin/makefs/cd9660.c:1.60 --- src/usr.sbin/makefs/cd9660.c:1.59 Tue Apr 18 23:05:51 2023 +++ src/usr.sbin/makefs/cd9660.c Thu Dec 28 12:13:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660.c,v 1.59 2023/04/18 23:05:51 christos Exp $ */ +/* $NetBSD: cd9660.c,v 1.60 2023/12/28 12:13:55 tsutsui Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -103,7 +103,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: cd9660.c,v 1.59 2023/04/18 23:05:51 christos Exp $"); +__RCSID("$NetBSD: cd9660.c,v 1.60 2023/12/28 12:13:55 tsutsui Exp $"); #endif /* !__lint */ #include <string.h> @@ -1188,7 +1188,7 @@ cd9660_copy_filenames(iso9660_disk *disk if (TAILQ_FIRST(&node->cn_children)->isoDirRecord == NULL) { debug_print_tree(diskStructure, diskStructure->rootNode, 0); - exit(1); + exit(EXIT_FAILURE); } TAILQ_FOREACH(cn, &node->cn_children, cn_next_child) { Index: src/usr.sbin/makefs/ffs.c diff -u src/usr.sbin/makefs/ffs.c:1.74 src/usr.sbin/makefs/ffs.c:1.75 --- src/usr.sbin/makefs/ffs.c:1.74 Sat Jan 7 19:41:30 2023 +++ src/usr.sbin/makefs/ffs.c Thu Dec 28 12:13:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs.c,v 1.74 2023/01/07 19:41:30 chs Exp $ */ +/* $NetBSD: ffs.c,v 1.75 2023/12/28 12:13:55 tsutsui Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -71,7 +71,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: ffs.c,v 1.74 2023/01/07 19:41:30 chs Exp $"); +__RCSID("$NetBSD: ffs.c,v 1.75 2023/12/28 12:13:55 tsutsui Exp $"); #endif /* !__lint */ #include <sys/param.h> @@ -276,7 +276,7 @@ ffs_makefs(const char *image, const char /* create image */ TIMER_START(start); if (ffs_create_image(image, fsopts) == -1) - errx(1, "Image file `%s' not created.", image); + errx(EXIT_FAILURE, "Image file `%s' not created.", image); TIMER_RESULTS(start, "ffs_create_image"); fsopts->curinode = UFS_ROOTINO; @@ -288,7 +288,7 @@ ffs_makefs(const char *image, const char printf("Populating `%s'\n", image); TIMER_START(start); if (! ffs_populate_dir(dir, root, fsopts)) - errx(1, "Image file `%s' not populated.", image); + errx(EXIT_FAILURE, "Image file `%s' not populated.", image); TIMER_RESULTS(start, "ffs_populate_dir"); /* ensure no outstanding buffers remain */ @@ -306,7 +306,7 @@ ffs_makefs(const char *image, const char /* write out superblock; image is now complete */ ffs_write_superblock(fsopts->superblock, fsopts); if (close(fsopts->fd) == -1) - err(1, "Closing `%s'", image); + err(EXIT_FAILURE, "Closing `%s'", image); fsopts->fd = -1; printf("Image `%s' complete\n", image); } @@ -423,7 +423,8 @@ ffs_validate(const char *dir, fsnode *ro } /* now check calculated sizes vs requested sizes */ if (fsopts->maxsize > 0 && fsopts->size > fsopts->maxsize) { - errx(1, "`%s' size of %lld is larger than the maxsize of %lld.", + errx(EXIT_FAILURE, + "`%s' size of %lld is larger than the maxsize of %lld.", dir, (long long)fsopts->size, (long long)fsopts->maxsize); } } @@ -811,7 +812,7 @@ ffs_populate_dir(const char *dir, fsnode if ((size_t)snprintf(path, sizeof(path), "%s/%s/%s", cur->root, cur->path, cur->name) >= sizeof(path)) - errx(1, "Pathname too long."); + errx(EXIT_FAILURE, "Pathname too long."); if (cur->child != NULL) continue; /* child creates own inode */ @@ -852,7 +853,7 @@ ffs_populate_dir(const char *dir, fsnode continue; if ((size_t)snprintf(path, sizeof(path), "%s/%s", dir, cur->name) >= sizeof(path)) - errx(1, "Pathname too long."); + errx(EXIT_FAILURE, "Pathname too long."); if (! ffs_populate_dir(path, cur->child, fsopts)) return (0); } @@ -956,7 +957,7 @@ ffs_write_file(union dinode *din, uint32 errno = ffs_balloc(&in, offset, chunk, &bp); bad_ffs_write_file: if (errno != 0) - err(1, + err(EXIT_FAILURE, "Writing inode %d (%s), bytes %lld + %lld", ino, isfile ? (char *)buf : @@ -1089,7 +1090,8 @@ ffs_write_inode(union dinode *dp, uint32 fsopts); cgp = (struct cg *)sbbuf; if (!cg_chkmagic(cgp, fsopts->needswap)) - errx(1, "ffs_write_inode: cg %d: bad magic number", cg); + errx(EXIT_FAILURE, + "ffs_write_inode: cg %d: bad magic number", cg); assert (isclr(cg_inosused(cgp, fsopts->needswap), cgino)); @@ -1098,10 +1100,10 @@ ffs_write_inode(union dinode *dp, uint32 dp2 = (struct ufs2_dinode *)buf; if (fs->fs_cstotal.cs_nifree == 0) - errx(1, "ffs_write_inode: fs out of inodes for ino %u", - ino); + errx(EXIT_FAILURE, + "ffs_write_inode: fs out of inodes for ino %u", ino); if (fs->fs_cs(fs, cg).cs_nifree == 0) - errx(1, + errx(EXIT_FAILURE, "ffs_write_inode: cg %d out of inodes for ino %u", cg, ino); setbit(cg_inosused(cgp, fsopts->needswap), cgino); @@ -1166,5 +1168,5 @@ panic(const char *fmt, ...) va_start(ap, fmt); vwarnx(fmt, ap); va_end(ap); - exit(1); + exit(EXIT_FAILURE); } Index: src/usr.sbin/makefs/makefs.c diff -u src/usr.sbin/makefs/makefs.c:1.55 src/usr.sbin/makefs/makefs.c:1.56 --- src/usr.sbin/makefs/makefs.c:1.55 Sat Apr 9 10:05:35 2022 +++ src/usr.sbin/makefs/makefs.c Thu Dec 28 12:13:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: makefs.c,v 1.55 2022/04/09 10:05:35 riastradh Exp $ */ +/* $NetBSD: makefs.c,v 1.56 2023/12/28 12:13:55 tsutsui Exp $ */ /* * Copyright (c) 2001-2003 Wasabi Systems, Inc. @@ -41,7 +41,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: makefs.c,v 1.55 2022/04/09 10:05:35 riastradh Exp $"); +__RCSID("$NetBSD: makefs.c,v 1.56 2023/12/28 12:13:55 tsutsui Exp $"); #endif /* !__lint */ #include <assert.h> @@ -107,7 +107,8 @@ main(int argc, char *argv[]) debug = 0; if ((fstype = get_fstype(DEFAULT_FSTYPE)) == NULL) - errx(1, "Unknown default fs type `%s'.", DEFAULT_FSTYPE); + errx(EXIT_FAILURE, + "Unknown default fs type `%s'.", DEFAULT_FSTYPE); /* set default fsoptions */ (void)memset(&fsoptions, 0, sizeof(fsoptions)); @@ -126,7 +127,7 @@ main(int argc, char *argv[]) start_time.tv_nsec = start.tv_usec * 1000; #endif if (ch == -1) - err(1, "Unable to get system time"); + err(EXIT_FAILURE, "Unable to get system time"); while ((ch = getopt(argc, argv, "B:b:d:f:F:LM:m:N:O:o:rs:S:t:T:xZ")) != -1) { @@ -198,7 +199,7 @@ main(int argc, char *argv[]) case 'N': if (! setup_getid(optarg)) - errx(1, + errx(EXIT_FAILURE, "Unable to use user and group databases in `%s'", optarg); break; @@ -219,7 +220,7 @@ main(int argc, char *argv[]) while ((p = strsep(&optarg, ",")) != NULL) { if (*p == '\0') - errx(1, "Empty option"); + errx(EXIT_FAILURE, "Empty option"); if (! fstype->parse_options(p, &fsoptions)) usage(fstype, &fsoptions); } @@ -247,14 +248,15 @@ main(int argc, char *argv[]) fstype->cleanup_options(&fsoptions); fsoptions.fs_specific = NULL; if ((fstype = get_fstype(optarg)) == NULL) - errx(1, "Unknown fs type `%s'.", optarg); + errx(EXIT_FAILURE, + "Unknown fs type `%s'.", optarg); fstype->prepare_options(&fsoptions); break; case 'T': if (get_tstamp(optarg, &stampst) == -1) - errx(1, "Cannot get timestamp from `%s'", - optarg); + errx(EXIT_FAILURE, + "Cannot get timestamp from `%s'", optarg); break; case 'x': @@ -286,7 +288,7 @@ main(int argc, char *argv[]) /* -x must be accompanied by -F */ if (fsoptions.onlyspec != 0 && specfile == NULL) - errx(1, "-x requires -F mtree-specfile."); + errx(EXIT_FAILURE, "-x requires -F mtree-specfile."); /* walk the tree */ TIMER_START(start); @@ -298,9 +300,9 @@ main(int argc, char *argv[]) for (i = 2; i < argc; i++) { struct stat sb; if (stat(argv[i], &sb) == -1) - err(1, "Can't stat `%s'", argv[i]); + err(EXIT_FAILURE, "Can't stat `%s'", argv[i]); if (!S_ISDIR(sb.st_mode)) - errx(1, "%s: not a directory", argv[i]); + errx(EXIT_FAILURE, "%s: not a directory", argv[i]); TIMER_START(start); root = walk_dir(argv[i], ".", NULL, root, fsoptions.replace, fsoptions.follow); @@ -326,7 +328,7 @@ main(int argc, char *argv[]) free_fsnodes(root); - exit(0); + exit(EXIT_SUCCESS); /* NOTREACHED */ } @@ -483,5 +485,5 @@ usage(fstype_t *fstype, fsinfo_t *fsopti o[i].letter ? ',' : ' ', o[i].name, o[i].desc); } - exit(1); + exit(EXIT_FAILURE); } Index: src/usr.sbin/makefs/msdos.c diff -u src/usr.sbin/makefs/msdos.c:1.22 src/usr.sbin/makefs/msdos.c:1.23 --- src/usr.sbin/makefs/msdos.c:1.22 Wed Dec 20 15:07:16 2023 +++ src/usr.sbin/makefs/msdos.c Thu Dec 28 12:13:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: msdos.c,v 1.22 2023/12/20 15:07:16 tsutsui Exp $ */ +/* $NetBSD: msdos.c,v 1.23 2023/12/28 12:13:55 tsutsui Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: msdos.c,v 1.22 2023/12/20 15:07:16 tsutsui Exp $"); +__RCSID("$NetBSD: msdos.c,v 1.23 2023/12/28 12:13:55 tsutsui Exp $"); #endif /* !__lint */ #include <sys/param.h> @@ -168,7 +168,7 @@ msdos_makefs(const char *image, const ch } else if (fsopts->sectorsize == -1) { fsopts->sectorsize = msdos_opt->options.bytes_per_sector; } else if (fsopts->sectorsize != msdos_opt->options.bytes_per_sector) { - err(1, "inconsistent sectorsize -S %u" + err(EXIT_FAILURE, "inconsistent sectorsize -S %u" "!= -o bytes_per_sector %u", fsopts->sectorsize, msdos_opt->options.bytes_per_sector); } @@ -177,7 +177,7 @@ msdos_makefs(const char *image, const ch printf("Creating `%s'\n", image); TIMER_START(start); if (mkfs_msdos(image, NULL, &msdos_opt->options) == -1) - errx(1, "Image file `%s' not created.", image); + errx(EXIT_FAILURE, "Image file `%s' not created.", image); TIMER_RESULTS(start, "mkfs_msdos"); fsopts->fd = open(image, O_RDWR); @@ -188,10 +188,10 @@ msdos_makefs(const char *image, const ch flags |= MSDOSFSMNT_UTF8; if ((pmp = msdosfs_mount(&vp, flags)) == NULL) - err(1, "msdosfs_mount"); + err(EXIT_FAILURE, "msdosfs_mount"); if (msdosfs_root(pmp, &rootvp) != 0) - err(1, "msdosfs_root"); + err(EXIT_FAILURE, "msdosfs_root"); if (debug & DEBUG_FS_MAKEFS) printf("msdos_makefs: image %s directory %s root %p\n", @@ -201,7 +201,7 @@ msdos_makefs(const char *image, const ch printf("Populating `%s'\n", image); TIMER_START(start); if (msdos_populate_dir(dir, VTODE(&rootvp), root, root, fsopts) == -1) - errx(1, "Image file `%s' not populated.", image); + errx(EXIT_FAILURE, "Image file `%s' not populated.", image); TIMER_RESULTS(start, "msdos_populate_dir"); if (debug & DEBUG_FS_MAKEFS) Index: src/usr.sbin/makefs/udf.c diff -u src/usr.sbin/makefs/udf.c:1.30 src/usr.sbin/makefs/udf.c:1.31 --- src/usr.sbin/makefs/udf.c:1.30 Sat May 7 08:54:02 2022 +++ src/usr.sbin/makefs/udf.c Thu Dec 28 12:13:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: udf.c,v 1.30 2022/05/07 08:54:02 reinoud Exp $ */ +/* $NetBSD: udf.c,v 1.31 2023/12/28 12:13:55 tsutsui Exp $ */ /* * Copyright (c) 2006, 2008, 2013, 2021, 2022 Reinoud Zandijk @@ -30,7 +30,7 @@ #endif #include <sys/cdefs.h> -__RCSID("$NetBSD: udf.c,v 1.30 2022/05/07 08:54:02 reinoud Exp $"); +__RCSID("$NetBSD: udf.c,v 1.31 2023/12/28 12:13:55 tsutsui Exp $"); #include <stdio.h> #include <stdlib.h> @@ -251,7 +251,8 @@ udf_parse_opts(const char *option, fsinf emul_mmc_profile = 0x1a; stdsize = DVDRWSIZE; } else { - errx(1, "unknown or unimplemented disc format"); + errx(EXIT_FAILURE, + "unknown or unimplemented disc format"); } if (emul_mmc_profile != 0x01) set_sectorsize = 2048; @@ -271,20 +272,23 @@ udf_parse_opts(const char *option, fsinf if (context.primary_name) free(context.primary_name); if ((strstr(buf, ":"))) - errx(1, "primary name can't have ':' in its name"); + errx(EXIT_FAILURE, + "primary name can't have ':' in its name"); context.primary_name = strdup(buf); break; case 'v': context.min_udf = a_udf_version(buf, "min_udf"); if (context.min_udf > 0x250) - errx(1, "maximum supported version is UDF 2.50"); + errx(EXIT_FAILURE, + "maximum supported version is UDF 2.50"); if (context.min_udf > context.max_udf) context.max_udf = context.min_udf; break; case 'V': context.max_udf = a_udf_version(buf, "min_udf"); if (context.max_udf > 0x250) - errx(1, "maximum supported version is UDF 2.50"); + errx(EXIT_FAILURE, + "maximum supported version is UDF 2.50"); if (context.min_udf > context.max_udf) context.min_udf = context.max_udf; break; @@ -334,7 +338,7 @@ udf_inc_link(union dscrptr *dscr) efe = &dscr->efe; efe->link_cnt = udf_rw16(udf_rw16(efe->link_cnt) + 1); } else { - errx(1, "bad tag passed to udf_inc_link"); + errx(EXIT_FAILURE, "bad tag passed to udf_inc_link"); } } @@ -352,7 +356,7 @@ udf_set_link_cnt(union dscrptr *dscr, in efe = &dscr->efe; efe->link_cnt = udf_rw16(num); } else { - errx(1, "bad tag passed to udf_set_link_cnt"); + errx(EXIT_FAILURE, "bad tag passed to udf_set_link_cnt"); } } @@ -432,7 +436,7 @@ udf_file_inject_blob(union dscrptr *dscr inf_len = udf_rw64(efe->inf_len); obj_size = udf_rw64(efe->obj_size); } else { - errx(1, "bad tag passed to udf_file_inject_blob"); + errx(EXIT_FAILURE, "bad tag passed to udf_file_inject_blob"); } crclen = udf_rw16(dscr->tag.desc_crc_len); @@ -522,7 +526,7 @@ udf_append_file_mapping(union dscrptr *d obj_size = udf_rw64(efe->obj_size); logblks_rec = udf_rw64(efe->logblks_rec); } else { - errx(1, "bad tag passed to udf_file_append_blob"); + errx(EXIT_FAILURE, "bad tag passed to udf_file_append_blob"); } crclen = udf_rw16(dscr->tag.desc_crc_len); @@ -1154,7 +1158,7 @@ udf_enumerate_and_estimate(const char *d if (fsopts->size) { if (fsopts->size < proposed_size) - errx(1, "makefs_udf: won't fit on disc!"); + errx(EXIT_FAILURE, "makefs_udf: won't fit on disc!"); } else { fsopts->size = proposed_size; } @@ -1180,12 +1184,12 @@ udf_makefs(const char *image, const char /* names */ error = udf_proces_names(); if (error) - errx(1, "bad names given"); + errx(EXIT_FAILURE, "bad names given"); /* open disc device or emulated file */ if (udf_opendisc(image, O_CREAT)) { udf_closedisc(); - errx(1, "can't open %s", image); + errx(EXIT_FAILURE, "can't open %s", image); } fsopts->fd = dev_fd; @@ -1196,7 +1200,7 @@ udf_makefs(const char *image, const char error = udf_derive_format(req_enable, req_disable); if (error) { udf_closedisc(); - errx(1, "can't derive format from media/settings"); + errx(EXIT_FAILURE, "can't derive format from media/settings"); } /* estimate the amount of space needed */ @@ -1212,13 +1216,13 @@ udf_makefs(const char *image, const char (long)fsopts->inodes); emul_size = MAX(emul_size, fsopts->size); if ((fsopts->maxsize > 0) && (emul_size > fsopts->maxsize)) - errx(1, "won't fit due to set maximum disk size"); + errx(EXIT_FAILURE, "won't fit due to set maximum disk size"); /* prepare disc if necessary (recordables mainly) */ error = udf_prepare_disc(); if (error) { udf_closedisc(); - errx(1, "preparing disc failed"); + errx(EXIT_FAILURE, "preparing disc failed"); } /* update mmc info but now with correct size */ @@ -1243,7 +1247,7 @@ udf_makefs(const char *image, const char udf_allow_writing(); if (udf_do_newfs_prefix()) { udf_closedisc(); - errx(1, "basic setup failed"); + errx(EXIT_FAILURE, "basic setup failed"); } /* update context */ Index: src/usr.sbin/makefs/walk.c diff -u src/usr.sbin/makefs/walk.c:1.32 src/usr.sbin/makefs/walk.c:1.33 --- src/usr.sbin/makefs/walk.c:1.32 Sat Apr 9 10:05:35 2022 +++ src/usr.sbin/makefs/walk.c Thu Dec 28 12:13:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: walk.c,v 1.32 2022/04/09 10:05:35 riastradh Exp $ */ +/* $NetBSD: walk.c,v 1.33 2023/12/28 12:13:55 tsutsui Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -41,7 +41,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: walk.c,v 1.32 2022/04/09 10:05:35 riastradh Exp $"); +__RCSID("$NetBSD: walk.c,v 1.33 2023/12/28 12:13:55 tsutsui Exp $"); #endif /* !__lint */ #include <sys/param.h> @@ -92,11 +92,11 @@ walk_dir(const char *root, const char *d len = snprintf(path, sizeof(path), "%s/%s", root, dir); if (len >= (int)sizeof(path)) - errx(1, "Pathname too long."); + errx(EXIT_FAILURE, "Pathname too long."); if (debug & DEBUG_WALK_DIR) printf("walk_dir: %s %p\n", path, parent); if ((dirp = opendir(path)) == NULL) - err(1, "Can't opendir `%s'", path); + err(EXIT_FAILURE, "Can't opendir `%s'", path); rp = path + strlen(root) + 1; if (join != NULL) { first = cur = join; @@ -126,13 +126,13 @@ walk_dir(const char *root, const char *d printf("scanning %s/%s/%s\n", root, dir, name); if (snprintf(path + len, sizeof(path) - len, "/%s", name) >= (int)sizeof(path) - len) - errx(1, "Pathname too long."); + errx(EXIT_FAILURE, "Pathname too long."); if (follow) { if (stat(path, &stbuf) == -1) - err(1, "Can't stat `%s'", path); + err(EXIT_FAILURE, "Can't stat `%s'", path); } else { if (lstat(path, &stbuf) == -1) - err(1, "Can't lstat `%s'", path); + err(EXIT_FAILURE, "Can't lstat `%s'", path); } #ifdef S_ISSOCK if (S_ISSOCK(stbuf.st_mode & S_IFMT)) { @@ -164,7 +164,8 @@ walk_dir(const char *root, const char *d continue; } if (!replace) - errx(1, "Can't merge %s `%s' with " + errx(EXIT_FAILURE, + "Can't merge %s `%s' with " "existing %s", inode_type(stbuf.st_mode), path, inode_type(cur->type)); @@ -229,7 +230,7 @@ walk_dir(const char *root, const char *d llen = readlink(path, slink, sizeof(slink) - 1); if (llen == -1) - err(1, "Readlink `%s'", path); + err(EXIT_FAILURE, "Readlink `%s'", path); slink[llen] = '\0'; cur->symlink = estrdup(slink); } @@ -239,7 +240,7 @@ walk_dir(const char *root, const char *d for (cur = first->next; cur != NULL; cur = cur->next) cur->first = first; if (closedir(dirp) == -1) - err(1, "Can't closedir `%s/%s'", root, dir); + err(EXIT_FAILURE, "Can't closedir `%s/%s'", root, dir); return (first); } @@ -344,16 +345,17 @@ apply_specfile(const char *specfile, con /* read in the specfile */ if ((fp = fopen(specfile, "r")) == NULL) - err(1, "Can't open `%s'", specfile); + err(EXIT_FAILURE, "Can't open `%s'", specfile); TIMER_START(start); root = spec(fp); TIMER_RESULTS(start, "spec"); if (fclose(fp) == EOF) - err(1, "Can't close `%s'", specfile); + err(EXIT_FAILURE, "Can't close `%s'", specfile); /* perform some sanity checks */ if (root == NULL) - errx(1, "Specfile `%s' did not contain a tree", specfile); + errx(EXIT_FAILURE, + "Specfile `%s' did not contain a tree", specfile); assert(strcmp(root->name, ".") == 0); assert(root->type == F_DIR); @@ -377,10 +379,10 @@ apply_specdir(const char *dir, NODE *spe printf("apply_specdir: %s %p %p\n", dir, specnode, dirnode); if (specnode->type != F_DIR) - errx(1, "Specfile node `%s/%s' is not a directory", + errx(EXIT_FAILURE, "Specfile node `%s/%s' is not a directory", dir, specnode->name); if (dirnode->type != S_IFDIR) - errx(1, "Directory node `%s/%s' is not a directory", + errx(EXIT_FAILURE, "Directory node `%s/%s' is not a directory", dir, dirnode->name); apply_specentry(dir, specnode, dirnode); @@ -427,7 +429,7 @@ apply_specdir(const char *dir, NODE *spe } if ((size_t)snprintf(path, sizeof(path), "%s/%s", dir, curnode->name) >= sizeof(path)) - errx(1, "Pathname too long."); + errx(EXIT_FAILURE, "Pathname too long."); if (curfsnode == NULL) { /* need new entry */ struct stat stbuf; @@ -442,7 +444,8 @@ apply_specdir(const char *dir, NODE *spe /* check that enough info is provided */ #define NODETEST(t, m) \ if (!(t)) \ - errx(1, "`%s': %s not provided", path, m) + errx(EXIT_FAILURE, \ + "`%s': %s not provided", path, m) NODETEST(curnode->flags & F_TYPE, "type"); NODETEST(curnode->flags & F_MODE, "mode"); /* XXX: require F_TIME ? */ @@ -490,7 +493,8 @@ apply_specdir(const char *dir, NODE *spe apply_specentry(dir, curnode, curfsnode); if (curnode->type == F_DIR) { if (curfsnode->type != S_IFDIR) - errx(1, "`%s' is not a directory", path); + errx(EXIT_FAILURE, + "`%s' is not a directory", path); assert (curfsnode->child != NULL); apply_specdir(path, curnode, curfsnode->child, speconly); } @@ -505,7 +509,8 @@ apply_specentry(const char *dir, NODE *s assert(dirnode != NULL); if (nodetoino(specnode->type) != dirnode->type) - errx(1, "`%s/%s' type mismatch: specfile %s, tree %s", + errx(EXIT_FAILURE, + "`%s/%s' type mismatch: specfile %s, tree %s", dir, specnode->name, inode_type(nodetoino(specnode->type)), inode_type(dirnode->type)); @@ -594,7 +599,7 @@ dump_fsnodes(fsnode *root) for (cur = root; cur != NULL; cur = cur->next) { if (snprintf(path, sizeof(path), "%s/%s", cur->path, cur->name) >= (int)sizeof(path)) - errx(1, "Pathname too long."); + errx(EXIT_FAILURE, "Pathname too long."); if (debug & DEBUG_DUMP_FSNODES_VERBOSE) printf("cur=%8p parent=%8p first=%8p ", Index: src/usr.sbin/makefs/cd9660/cd9660_debug.c diff -u src/usr.sbin/makefs/cd9660/cd9660_debug.c:1.13 src/usr.sbin/makefs/cd9660/cd9660_debug.c:1.14 --- src/usr.sbin/makefs/cd9660/cd9660_debug.c:1.13 Sat Oct 19 17:16:37 2013 +++ src/usr.sbin/makefs/cd9660/cd9660_debug.c Thu Dec 28 12:13:55 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_debug.c,v 1.13 2013/10/19 17:16:37 christos Exp $ */ +/* $NetBSD: cd9660_debug.c,v 1.14 2023/12/28 12:13:55 tsutsui Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -40,7 +40,7 @@ #include <sys/param.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: cd9660_debug.c,v 1.13 2013/10/19 17:16:37 christos Exp $"); +__RCSID("$NetBSD: cd9660_debug.c,v 1.14 2023/12/28 12:13:55 tsutsui Exp $"); #endif /* !__lint */ #if !HAVE_NBTOOL_CONFIG_H @@ -207,7 +207,7 @@ debug_dump_to_xml_path_table(FILE *fd, o int n = 0; if (fseeko(fd, CD9660_SECTOR_SIZE * sector, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); while (t < size) { /* Read fixed data first */ @@ -244,7 +244,7 @@ debug_dump_to_xml(FILE *fd) sector = 16; do { if (fseeko(fd, CD9660_SECTOR_SIZE * sector, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); fread(buf, 1, CD9660_SECTOR_SIZE, fd); t = (int)((unsigned char)buf[0]); switch (t) { Index: src/usr.sbin/makefs/cd9660/cd9660_eltorito.c diff -u src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.26 src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.27 --- src/usr.sbin/makefs/cd9660/cd9660_eltorito.c:1.26 Tue Apr 18 23:00:02 2023 +++ src/usr.sbin/makefs/cd9660/cd9660_eltorito.c Thu Dec 28 12:13:56 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_eltorito.c,v 1.26 2023/04/18 23:00:02 christos Exp $ */ +/* $NetBSD: cd9660_eltorito.c,v 1.27 2023/12/28 12:13:56 tsutsui Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -40,7 +40,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: cd9660_eltorito.c,v 1.26 2023/04/18 23:00:02 christos Exp $"); +__RCSID("$NetBSD: cd9660_eltorito.c,v 1.27 2023/12/28 12:13:56 tsutsui Exp $"); #endif /* !__lint */ #ifdef DEBUG @@ -546,7 +546,7 @@ cd9660_write_mbr_partition_entry(FILE *f uint32_t lba; if (fseeko(fd, (off_t)(idx) * 16 + 0x1be, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); val = 0x80; /* Bootable */ fwrite(&val, sizeof(val), 1, fd); @@ -593,7 +593,7 @@ cd9660_write_apm_partition_entry(FILE *f APPLE_PS_WRITABLE; if (fseeko(fd, (off_t)(idx + 1) * sector_size, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); /* Signature */ apm16 = htobe16(0x504d); @@ -639,7 +639,7 @@ cd9660_write_boot(iso9660_disk *diskStru /* write boot catalog */ if (fseeko(fd, (off_t)diskStructure->boot_catalog_sector * diskStructure->sectorSize, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); if (diskStructure->verbose_level > 0) { printf("Writing boot catalog to sector %" PRId64 "\n", Index: src/usr.sbin/makefs/cd9660/cd9660_write.c diff -u src/usr.sbin/makefs/cd9660/cd9660_write.c:1.17 src/usr.sbin/makefs/cd9660/cd9660_write.c:1.18 --- src/usr.sbin/makefs/cd9660/cd9660_write.c:1.17 Sat Oct 19 17:16:37 2013 +++ src/usr.sbin/makefs/cd9660/cd9660_write.c Thu Dec 28 12:13:56 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_write.c,v 1.17 2013/10/19 17:16:37 christos Exp $ */ +/* $NetBSD: cd9660_write.c,v 1.18 2023/12/28 12:13:56 tsutsui Exp $ */ /* * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan @@ -37,7 +37,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(__lint) -__RCSID("$NetBSD: cd9660_write.c,v 1.17 2013/10/19 17:16:37 christos Exp $"); +__RCSID("$NetBSD: cd9660_write.c,v 1.18 2023/12/28 12:13:56 tsutsui Exp $"); #endif /* !__lint */ #include <util.h> @@ -305,7 +305,7 @@ cd9660_write_file(iso9660_disk *diskStru working_sector = writenode->fileDataSector; if (fseeko(fd, working_sector * diskStructure->sectorSize, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); /* * Now loop over children, writing out their directory @@ -330,7 +330,7 @@ cd9660_write_file(iso9660_disk *diskStru /* Seek to the next sector. */ if (fseeko(fd, working_sector * diskStructure->sectorSize, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); } /* Write out the basic ISO directory record */ (void)fwrite(&temp_record, 1, @@ -343,7 +343,7 @@ cd9660_write_file(iso9660_disk *diskStru diskStructure->sectorSize + cur_sector_offset + temp_record.length[0] - temp->su_tail_size, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); if (temp->su_tail_size > 0) fwrite(temp->su_tail_data, 1, temp->su_tail_size, fd); @@ -394,12 +394,12 @@ cd9660_write_filedata(iso9660_disk *disk curpos = ftello(fd); if (fseeko(fd, sector * diskStructure->sectorSize, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); success = fwrite(buf, diskStructure->sectorSize * numsecs, 1, fd); if (fseeko(fd, curpos, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); if (success == 1) success = diskStructure->sectorSize * numsecs; @@ -439,7 +439,7 @@ cd9660_copy_file(iso9660_disk *diskStruc printf("Writing file: %s\n",filename); if (fseeko(fd, start_sector * diskStructure->sectorSize, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); while (!feof(rf)) { bytes_read = fread(buf,1,buf_size,rf); @@ -475,7 +475,7 @@ cd9660_write_rr(iso9660_disk *diskStruct offset += writenode->isoDirRecord->length[0]; if (fseeko(fd, sector * diskStructure->sectorSize + offset, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); /* Offset now points at the end of the record */ TAILQ_FOREACH(myattr, &writenode->head, rr_ll) { fwrite(&(myattr->attr), CD9660_SUSP_ENTRY_SIZE(myattr), 1, fd); @@ -492,7 +492,7 @@ cd9660_write_rr(iso9660_disk *diskStruct diskStructure->sectorSize) + writenode->susp_entry_ce_start, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); in_ca = 1; } } @@ -505,5 +505,5 @@ cd9660_write_rr(iso9660_disk *diskStruct if (in_ca) if (fseeko(fd, sector * diskStructure->sectorSize + offset, SEEK_SET) == -1) - err(1, "fseeko"); + err(EXIT_FAILURE, "fseeko"); }