Patchwork [08/10] mount.cifs: don't use exit(3) in main()

login
register
mail settings
Submitter Jeff Layton
Date March 21, 2010, 7:20 p.m.
Message ID <1269199227-21446-9-git-send-email-jlayton@redhat.com>
Download mbox | patch
Permalink /patch/48231/
State New
Headers show

Comments

Jeff Layton - March 21, 2010, 7:20 p.m.
Clean up error handling in main() so that cleanup tasks are completed
rather than assuming exit processing will handle it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 mount.cifs.c |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

Patch

diff --git a/mount.cifs.c b/mount.cifs.c
index 76cf851..ac35ee4 100644
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -1229,8 +1229,10 @@  int main(int argc, char ** argv)
 			break;
 		case 'o':
 			orgoptions = strndup(optarg, MAX_OPTIONS_LEN);
-			if (!orgoptions)
-				exit(EX_SYSERR);
+			if (!orgoptions) {
+				rc = EX_SYSERR;
+				goto mount_exit;
+			}
 			break;
 		case 'r':  /* mount readonly */
 			flags |= MS_RDONLY;
@@ -1251,14 +1253,16 @@  int main(int argc, char ** argv)
 				uid = strtoul(optarg, &ep, 10);
 				if (*ep) {
 					fprintf(stderr, "bad uid value \"%s\"\n", optarg);
-					exit(EX_USAGE);
+					rc = EX_USAGE;
+					goto mount_exit;
 				}
 			} else {
 				struct passwd *pw;
 
 				if (!(pw = getpwnam(optarg))) {
 					fprintf(stderr, "bad user name \"%s\"\n", optarg);
-					exit(EX_USAGE);
+					rc = EX_USAGE;
+					goto mount_exit;
 				}
 				uid = pw->pw_uid;
 				endpwent();
@@ -1271,14 +1275,16 @@  int main(int argc, char ** argv)
 				gid = strtoul(optarg, &ep, 10);
 				if (*ep) {
 					fprintf(stderr, "bad gid value \"%s\"\n", optarg);
-					exit(EX_USAGE);
+					rc = EX_USAGE;
+					goto mount_exit;
 				}
 			} else {
 				struct group *gr;
 
 				if (!(gr = getgrnam(optarg))) {
 					fprintf(stderr, "bad user name \"%s\"\n", optarg);
-					exit(EX_USAGE);
+					rc = EX_USAGE;
+					goto mount_exit;
 				}
 				gid = gr->gr_gid;
 				endpwent();
@@ -1321,7 +1327,8 @@  int main(int argc, char ** argv)
 	share_name = strndup(argv[optind], MAX_UNC_LEN);
 	if (share_name == NULL) {
 		fprintf(stderr, "%s: %s", thisprogram, strerror(ENOMEM));
-		exit(EX_SYSERR);
+		rc = EX_SYSERR;
+		goto mount_exit;
 	}
 	mountpoint = argv[optind + 1];
 
@@ -1430,7 +1437,8 @@  int main(int argc, char ** argv)
 		mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
 		if (!tmp_pass || !mountpassword) {
 			fprintf(stderr, "Password not entered, exiting\n");
-			exit(EX_USAGE);
+			rc = EX_USAGE;
+			goto mount_exit;
 		}
 		strlcpy(mountpassword, tmp_pass, MOUNT_PASSWD_SIZE+1);
 		got_password = 1;
@@ -1446,8 +1454,8 @@  int main(int argc, char ** argv)
 		optlen += strlen(share_name) + 4;
 	else {
 		fprintf(stderr, "No server share name specified\n");
-		fprintf(stderr, "\nMounting the DFS root for server not implemented yet\n");
-                exit(EX_USAGE);
+                rc = EX_USAGE;
+		goto mount_exit;
 	}
 	if(user_name)
 		optlen += strlen(user_name) + 6;
@@ -1657,5 +1665,5 @@  mount_exit:
 	SAFE_FREE(orgoptions);
 	SAFE_FREE(resolved_path);
 	SAFE_FREE(share_name);
-	exit(rc);
+	return rc;
 }