diff options
| author | Eric Andersen <andersen@codepoet.org> | 1999-10-18 22:28:26 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 1999-10-18 22:28:26 +0000 |
| commit | b0e9a709ba1ae1724d413a77f5b67b1a3e6c6cb7 (patch) | |
| tree | b951f34000ebdef0491eecd9386e5ea3e535171a /mkswap.c | |
| parent | 703c62da63aa31d665a8215f373b26e4b54f1bf4 (diff) | |
| download | busybox-w32-b0e9a709ba1ae1724d413a77f5b67b1a3e6c6cb7.tar.gz busybox-w32-b0e9a709ba1ae1724d413a77f5b67b1a3e6c6cb7.tar.bz2 busybox-w32-b0e9a709ba1ae1724d413a77f5b67b1a3e6c6cb7.zip | |
More stuff.
-Erik
Diffstat (limited to 'mkswap.c')
| -rw-r--r-- | mkswap.c | 17 |
1 files changed, 8 insertions, 9 deletions
| @@ -83,7 +83,7 @@ static int bit_test_and_clear (unsigned int *addr, unsigned int nr) | |||
| 83 | volatile void fatal_error(const char * fmt_string) | 83 | volatile void fatal_error(const char * fmt_string) |
| 84 | { | 84 | { |
| 85 | fprintf(stderr,fmt_string,program_name,device_name); | 85 | fprintf(stderr,fmt_string,program_name,device_name); |
| 86 | exit(1); | 86 | exit(FALSE); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | #define die(str) fatal_error("%s: " str "\n") | 89 | #define die(str) fatal_error("%s: " str "\n") |
| @@ -170,7 +170,7 @@ static int get_size(const char *file) | |||
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | int | 172 | int |
| 173 | mkswap(char *device_name, int pages, int check) | 173 | mkswap(const char *device_name, int pages, int check) |
| 174 | { | 174 | { |
| 175 | struct stat statbuf; | 175 | struct stat statbuf; |
| 176 | int goodpages; | 176 | int goodpages; |
| @@ -219,10 +219,10 @@ mkswap(char *device_name, int pages, int check) | |||
| 219 | die("unable to write signature page"); | 219 | die("unable to write signature page"); |
| 220 | 220 | ||
| 221 | close(DEV); | 221 | close(DEV); |
| 222 | return 0; | 222 | return (TRUE); |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | int mkswap_main(struct FileInfo * unnecessary, int argc, char ** argv) | 225 | int mkswap_main(int argc, char ** argv) |
| 226 | { | 226 | { |
| 227 | char * tmp; | 227 | char * tmp; |
| 228 | long int pages=0; | 228 | long int pages=0; |
| @@ -237,17 +237,16 @@ int mkswap_main(struct FileInfo * unnecessary, int argc, char ** argv) | |||
| 237 | if (device_name) { | 237 | if (device_name) { |
| 238 | pages = strtol(argv[0],&tmp,0)>>(PAGE_SHIFT-10); | 238 | pages = strtol(argv[0],&tmp,0)>>(PAGE_SHIFT-10); |
| 239 | if (*tmp) { | 239 | if (*tmp) { |
| 240 | usage(mkswap_usage); | 240 | usage (mkswap_usage); |
| 241 | exit(1); | ||
| 242 | } | 241 | } |
| 243 | } else | 242 | } else |
| 244 | device_name = argv[0]; | 243 | device_name = argv[0]; |
| 245 | else while (*++argv[0]) | 244 | else while (*++argv[0]) |
| 246 | switch (argv[0][0]) { | 245 | switch (argv[0][0]) { |
| 247 | case 'c': check=1; break; | 246 | case 'c': check=1; break; |
| 248 | default: usage(mkswap_usage); | 247 | default: usage (mkswap_usage); |
| 249 | exit(1); | 248 | exit( TRUE); |
| 250 | } | 249 | } |
| 251 | } | 250 | } |
| 252 | return mkswap(device_name, pages, check); | 251 | exit( mkswap(device_name, pages, check)); |
| 253 | } | 252 | } |