diff options
Diffstat (limited to 'disk-utils')
| -rw-r--r-- | disk-utils/fdformat.c | 2 | ||||
| -rw-r--r-- | disk-utils/fsck.minix.c | 10 | ||||
| -rw-r--r-- | disk-utils/mkfs.8 | 1 | ||||
| -rw-r--r-- | disk-utils/mkfs.c | 4 | ||||
| -rw-r--r-- | disk-utils/mkswap.c | 10 | ||||
| -rw-r--r-- | disk-utils/setfdprm.c | 2 |
6 files changed, 17 insertions, 12 deletions
diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c index b4aec0076b..cfbb455ce3 100644 --- a/disk-utils/fdformat.c +++ b/disk-utils/fdformat.c @@ -1,6 +1,6 @@ /* fdformat.c - Low-level formats a floppy disk - Werner Almesberger */ -/* 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org> +/* 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL> * - added Native Language Support * 1999-03-20 Arnaldo Carvalho de Melo <acme@conectiva.com.br> & - more i18n/nls translatable strings marked diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c index 1f040eb52e..e36594aa20 100644 --- a/disk-utils/fsck.minix.c +++ b/disk-utils/fsck.minix.c @@ -62,7 +62,7 @@ * 06.11.96 - Added v2 code submitted by Joerg Dorchain, but written by * Andreas Schwab. * - * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org> + * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL> * - added Native Language Support * * @@ -211,10 +211,10 @@ die(const char *str) { */ static void print_current_name(void) { - int i=0; + int i = 0; - while (i<name_depth) - printf("/%.*s",namelen,name_list[i++]); + while (i < name_depth) + printf("/%.*s", namelen, name_list[i++]); if (i == 0) printf ("/"); } @@ -978,7 +978,7 @@ check_file(struct minix_inode * dir, unsigned int offset) { if (!inode) return; if (name_depth < MAX_DEPTH) - strncpy(name_list[name_depth],name,namelen); + strncpy(name_list[name_depth], name, namelen); name_depth++; if (list) { if (verbose) diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8 index 260b4e0995..da69772c99 100644 --- a/disk-utils/mkfs.8 +++ b/disk-utils/mkfs.8 @@ -116,4 +116,5 @@ for the ext2 file system. .BR mkfs.ext2 (8), .BR mkfs.minix (8), .BR mkfs.msdos (8), +.BR mkfs.xfs (8), .BR mkfs.xiafs (8) diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c index 5ca2704c50..51b18f301c 100644 --- a/disk-utils/mkfs.c +++ b/disk-utils/mkfs.c @@ -10,7 +10,7 @@ * * Mon Jul 1 18:52:58 1996: janl@math.uio.no (Nicolai Langfeldt): * Incorporated fix by Jonathan Kamens <jik@annex-1-slip-jik.cam.ov.com> - * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org> + * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL> * - added Native Language Support * */ @@ -92,7 +92,7 @@ int main(int argc, char *argv[]) } sprintf(newpath, "%s:%s\n", SEARCH_PATH, oldpath); putenv(newpath); - sprintf(progname, PROGNAME, fstype); + snprintf(progname, sizeof(progname), PROGNAME, fstype); argv[--optind] = progname; if (verbose) { diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 6bd96d9043..ea2ec20dc9 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -26,7 +26,7 @@ * V1_MAX_PAGES fixes, jj, 990325. * sparc64 fixes, jj, 000219. * - * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org> + * 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL> * - added Native Language Support * */ @@ -41,12 +41,16 @@ #include <sys/stat.h> #include "nls.h" +/* Try to get PAGE_SIZE from libc or kernel includes */ +#ifdef HAVE_sys_user_h + /* Note: <sys/user.h> says: for gdb only */ +#include <sys/user.h> /* for PAGE_SIZE and PAGE_SHIFT */ +#else #ifdef HAVE_asm_page_h #include <asm/page.h> /* for PAGE_SIZE and PAGE_SHIFT */ /* we also get PAGE_SIZE via getpagesize() */ -/* recent glibc systems also define this in <sys/user.h> */ #endif - +#endif #ifndef _IO /* pre-1.3.45 */ diff --git a/disk-utils/setfdprm.c b/disk-utils/setfdprm.c index 958f98c16c..aee8a4d162 100644 --- a/disk-utils/setfdprm.c +++ b/disk-utils/setfdprm.c @@ -1,7 +1,7 @@ /* setfdprm.c - Sets user-provided floppy disk parameters, re-activates autodetection and switches diagnostic messages. */ -/* 1999-02-22 Arkadiusz Mi�kiewicz <misiek@misiek.eu.org> +/* 1999-02-22 Arkadiusz Mi�kiewicz <misiek@pld.ORG.PL> * - added Native Language Support */ |