aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/mount.c18
-rw-r--r--util-linux/umount.c8
2 files changed, 13 insertions, 13 deletions
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 4e5c0745b..d7b2682ce 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -190,7 +190,7 @@ extern int mount_main (int argc, char **argv)
190 } 190 }
191 endmntent (mountTable); 191 endmntent (mountTable);
192 } 192 }
193 return( TRUE); 193 exit( TRUE);
194 } 194 }
195 195
196 196
@@ -203,7 +203,7 @@ extern int mount_main (int argc, char **argv)
203 case 'o': 203 case 'o':
204 if (--i == 0) { 204 if (--i == 0) {
205 fprintf (stderr, "%s\n", mount_usage); 205 fprintf (stderr, "%s\n", mount_usage);
206 return( FALSE); 206 exit( FALSE);
207 } 207 }
208 parse_mount_options (*(++argv), &flags, string_flags); 208 parse_mount_options (*(++argv), &flags, string_flags);
209 --i; 209 --i;
@@ -215,7 +215,7 @@ extern int mount_main (int argc, char **argv)
215 case 't': 215 case 't':
216 if (--i == 0) { 216 if (--i == 0) {
217 fprintf (stderr, "%s\n", mount_usage); 217 fprintf (stderr, "%s\n", mount_usage);
218 return( FALSE); 218 exit( FALSE);
219 } 219 }
220 filesystemType = *(++argv); 220 filesystemType = *(++argv);
221 --i; 221 --i;
@@ -231,7 +231,7 @@ extern int mount_main (int argc, char **argv)
231 case 'h': 231 case 'h':
232 case '-': 232 case '-':
233 fprintf (stderr, "%s\n", mount_usage); 233 fprintf (stderr, "%s\n", mount_usage);
234 return( TRUE); 234 exit( TRUE);
235 break; 235 break;
236 } 236 }
237 } else { 237 } else {
@@ -241,7 +241,7 @@ extern int mount_main (int argc, char **argv)
241 directory=*argv; 241 directory=*argv;
242 else { 242 else {
243 fprintf (stderr, "%s\n", mount_usage); 243 fprintf (stderr, "%s\n", mount_usage);
244 return( TRUE); 244 exit( TRUE);
245 } 245 }
246 } 246 }
247 i--; 247 i--;
@@ -254,7 +254,7 @@ extern int mount_main (int argc, char **argv)
254 254
255 if (f == NULL) { 255 if (f == NULL) {
256 perror("/etc/fstab"); 256 perror("/etc/fstab");
257 return( FALSE); 257 exit( FALSE);
258 } 258 }
259 while ((m = getmntent (f)) != NULL) { 259 while ((m = getmntent (f)) != NULL) {
260 // If the file system isn't noauto, and isn't mounted on /, mount 260 // If the file system isn't noauto, and isn't mounted on /, mount
@@ -270,12 +270,12 @@ extern int mount_main (int argc, char **argv)
270 endmntent (f); 270 endmntent (f);
271 } else { 271 } else {
272 if (device && directory) { 272 if (device && directory) {
273 return (mount_one (device, directory, filesystemType, 273 exit (mount_one (device, directory, filesystemType,
274 flags, string_flags)); 274 flags, string_flags));
275 } else { 275 } else {
276 fprintf (stderr, "%s\n", mount_usage); 276 fprintf (stderr, "%s\n", mount_usage);
277 return( FALSE); 277 exit( FALSE);
278 } 278 }
279 } 279 }
280 return( TRUE); 280 exit( TRUE);
281} 281}
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 5274e2f6f..04cd8a080 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -69,7 +69,7 @@ umount_main(int argc, char * * argv)
69 69
70 if (argc < 2) { 70 if (argc < 2) {
71 fprintf(stderr, "Usage: %s", umount_usage); 71 fprintf(stderr, "Usage: %s", umount_usage);
72 return(FALSE); 72 exit(FALSE);
73 } 73 }
74 argc--; 74 argc--;
75 argv++; 75 argv++;
@@ -78,7 +78,7 @@ umount_main(int argc, char * * argv)
78 while (**argv == '-') { 78 while (**argv == '-') {
79 while (*++(*argv)) switch (**argv) { 79 while (*++(*argv)) switch (**argv) {
80 case 'a': 80 case 'a':
81 return umount_all(); 81 exit ( umount_all() );
82 break; 82 break;
83 default: 83 default:
84 fprintf(stderr, "Usage: %s\n", umount_usage); 84 fprintf(stderr, "Usage: %s\n", umount_usage);
@@ -86,10 +86,10 @@ umount_main(int argc, char * * argv)
86 } 86 }
87 } 87 }
88 if ( umount(*argv) == 0 ) 88 if ( umount(*argv) == 0 )
89 return (TRUE); 89 exit (TRUE);
90 else { 90 else {
91 perror("umount"); 91 perror("umount");
92 return( FALSE); 92 exit( FALSE);
93 } 93 }
94} 94}
95 95