masqmail: src/masqmail.c comparison

comparison src/masqmail.c @ 262:fc1c6425c024

s/EXIT_SUCCESS/0/ && s/EXIT_FAILURE/1/ The constants are all to bulky. We should have different, meaningful exit codes anyway.

author	markus schnalke <meillo@marmaro.de>
date	Thu, 02 Dec 2010 17:11:25 -0300
parents	0afe18a9ee03
children	e9e73505ab2c

comparison

equal deleted inserted replaced

-:0afe18a9ee03
+:fc1c6425c024
 	/* daemon */
 	if (!conf.run_as_user) {
 		if ((conf.orig_uid != 0) && (conf.orig_uid != conf.mail_uid)) {
 			fprintf(stderr, "must be root or %s for daemon.\n", DEF_MAIL_USER);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	}
 	/* reparent to init only if init is not already the parent */
 	if (getppid() != 1) {
 		if ((pid = fork()) > 0) {
-			exit(EXIT_SUCCESS);
+			exit(0);
 		} else if (pid < 0) {
 			logwrite(LOG_ALERT, "could not fork!\n");
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	}
 	signal(SIGTERM, sigterm_handler);
 	write_pidfile(PIDFILEDIR "/masqmail.pid");
 	DEBUG(5) debugf("accepting smtp message on stdin\n");
 	if (getpeername(0, (struct sockaddr *) (&saddr), &dummy) == 0) {
 		peername = g_strdup(inet_ntoa(saddr.sin_addr));
 	} else if (errno != ENOTSOCK)
-		exit(EXIT_FAILURE);
+		exit(1);
 	smtp_in(stdin, stderr, peername, NULL);
 }
 static void
 	message *msg = create_message();
 	gint i;
 	if (return_path && !is_privileged_user(conf.orig_uid)) {
 		fprintf(stderr, "must be root, %s or in group %s for setting return path.\n", DEF_MAIL_USER, DEF_MAIL_GROUP);
-		exit(EXIT_FAILURE);
+		exit(1);
 	}
 	if (!conf.run_as_user) {
 		seteuid(conf.orig_uid);
 		setegid(conf.orig_gid);
 	for (i = 0; i < addr_cnt; i++) {
 		if (addresses[i][0] != '|')
 			msg->rcpt_list = g_list_append(msg->rcpt_list, create_address_qualified(addresses[i], TRUE, conf.host_name));
 		else {
 			logwrite(LOG_ALERT, "no pipe allowed as recipient address: %s\n", addresses[i]);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	}
 	/* -f option */
 	msg->return_path = return_path;
 					conf.do_verbose = FALSE;
 					fclose(stdin);
 					fclose(stdout);
 					fclose(stderr);
 					if (deliver(msg)) {
-						exit(EXIT_SUCCESS);
+						exit(0);
 					} else
-						exit(EXIT_FAILURE);
+						exit(1);
 				} else if (pid < 0) {
 					logwrite(LOG_ALERT, "could not fork for delivery, id = %s\n", msg->uid);
 				}
 			}
 		} else {
 			fprintf(stderr, "Could not write spool file\n");
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	} else {
 		switch (err) {
 		case AERR_EOF:
 			fprintf(stderr, "unexpected EOF.\n");
-			exit(EXIT_FAILURE);
+			exit(1);
 		case AERR_NORCPT:
 			fprintf(stderr, "no recipients.\n");
-			exit(EXIT_FAILURE);
+			exit(1);
 		case AERR_SIZE:
 			fprintf(stderr, "max message size exceeded.\n");
-			exit(EXIT_FAILURE);
+			exit(1);
 		default:
 			/* should never happen: */
 			fprintf(stderr, "Unknown error (%d)\r\n", err);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
-		exit(EXIT_FAILURE);
+		exit(1);
 	}
 }
 /*
 currently only the `rm' command is supported
 	gboolean do_queue = FALSE;
 	gint queue_interval = 0;
 	gchar *M_cmd = NULL;
 	gboolean opt_t = FALSE;
 	gboolean opt_i = FALSE;
-	gint exit_code = EXIT_SUCCESS;
+	gint exit_code = 0;
 	gchar *conf_file = CONF_FILE;
 	gchar *route_name = NULL;
 	gchar *f_address = NULL;
 	address *return_path = NULL;  /* may be changed by -f option */
 	gchar *full_sender_name = NULL;
 		} else if (strncmp(opt, "C", 1) == 0) {
 			conf_file = get_optarg(argv, &arg, opt+1);
 			if (!conf_file) {
 				fprintf(stderr, "-C requires a filename as argument.\n");
-				exit(EXIT_FAILURE);
+				exit(1);
 			}
 		} else if (strncmp(opt, "d", 1) == 0) {
 			if (getuid() != 0) {
 				fprintf(stderr, "only root may set the debug level.\n");
-				exit(EXIT_FAILURE);
+				exit(1);
 			}
 			char *lvl = get_optarg(argv, &arg, opt+1);
 			if (!lvl) {
 				fprintf(stderr, "-d requires a number argument.\n");
-				exit(EXIT_FAILURE);
+				exit(1);
 			}
 			debug_level = atoi(lvl);
 		} else if (strncmp(opt, "f", 1) == 0) {
 			/* set return path */
 			gchar *address = get_optarg(argv, &arg, opt+1);
 			if (!address) {
 				fprintf(stderr, "-f requires an address argument\n");
-				exit(EXIT_FAILURE);
+				exit(1);
 			}
 			f_address = g_strdup(address);
 		} else if (strncmp(opt, "F", 1) == 0) {
 			full_sender_name = get_optarg(argv, &arg, opt+1);
 			if (!full_sender_name) {
 				fprintf(stderr, "-F requires a name argument\n");
-				exit(EXIT_FAILURE);
+				exit(1);
 			}
 		} else if (strcmp(opt, "i") == 0) {
 			opt_i = TRUE;
 		} else if (strcmp(opt, "v") == 0) {
 			do_verbose = TRUE;
 		} else {
 			fprintf(stderr, "unrecognized option `-%s'\n", opt);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	}
 	if (!mta_mode) {
 		mta_mode = (arg<argc || opt_t) ? MODE_ACCEPT : MODE_VERSION;
 	}
 	if (mta_mode == MODE_VERSION) {
 		mode_version();
-		exit(EXIT_SUCCESS);
+		exit(0);
 	}
 	/* initialize random generator */
 	srand(time(NULL));
 	/* ignore SIGPIPE signal */
 	chdir("/");
 	if (!conf.run_as_user) {
 		if (setgid(0) != 0) {
 			fprintf(stderr, "could not set gid to 0. Is the setuid bit set? : %s\n", strerror(errno));
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 		if (setuid(0) != 0) {
 			fprintf(stderr, "could not gain root privileges. Is the setuid bit set? : %s\n", strerror(errno));
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	}
 	if (!logopen()) {
 		fprintf(stderr, "could not open log file\n");
-		exit(EXIT_FAILURE);
+		exit(1);
 	}
 	DEBUG(1) debugf("masqmail %s starting\n", VERSION);
 	DEBUG(5) {
 	if (f_address) {
 		return_path = create_address_qualified(f_address, TRUE, conf.host_name);
 		g_free(f_address);
 		if (!return_path) {
 			fprintf(stderr, "invalid RFC821 address: %s\n", f_address);
-			exit(EXIT_FAILURE);
+			exit(1);
 		}
 	}
 	switch (mta_mode) {
 	case MODE_DAEMON:
 	case MODE_LIST:
 		queue_list();
 		break;
 	case MODE_BI:
-		exit(EXIT_SUCCESS);
+		exit(0);
 		break;  /* well... */
 	case MODE_MCMD:
 		exit(manipulate_queue(M_cmd, &argv[arg]) ? 0 : 1);
 		break;

Mercurial > masqmail

comparison src/masqmail.c @ 262:fc1c6425c024