Mercurial > masqmail

changeset 260:bd3109ec0f0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
substituted get_progname() with a call to strrchr()
author markus schnalke <meillo@marmaro.de>
date Thu, 02 Dec 2010 16:45:26 -0300 (2010-12-02)
parents f4117fd5a163
children 0afe18a9ee03
files src/masqmail.c
diffstat 1 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/masqmail.c	Thu Dec 02 16:22:55 2010 -0300
+++ b/src/masqmail.c	Thu Dec 02 16:45:26 2010 -0300
@@ -114,18 +114,6 @@
 	return NULL;
 }
 
-gchar*
-get_progname(gchar * arg0)
-{
-	gchar *p = arg0 + strlen(arg0) - 1;
-	while (p > arg0) {
-		if (*p == '/')
-			return p + 1;
-		p--;
-	}
-	return p;
-}
-
 gboolean
 write_pidfile(gchar * name)
 {
@@ -400,7 +388,9 @@
 	gboolean do_verbose = FALSE;
 	gint debug_level = -1;
 
-	progname = get_progname(argv[0]);
+	/* strip the path part */
+	progname = strrchr(argc[0], '/');
+	progname = (progname) ? progname+1 : argc[0];
 
 	if (strcmp(progname, "mailq") == 0) {
 		mta_mode = MODE_LIST;
@@ -537,7 +527,6 @@
 	}
 
 	if (!mta_mode) {
-		fprintf(stderr, "arg:%d argc:%d\n", arg, argc);
 		mta_mode = (arg<argc || opt_t) ? MODE_ACCEPT : MODE_VERSION;
 	}