Mercurial > masqmail

comparison src/masqmail.c @ 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
parents f4117fd5a163
children 0afe18a9ee03
comparison
equal deleted inserted replaced
259:f4117fd5a163 260:bd3109ec0f0a
110 /* this kind: -x val */ 110 /* this kind: -x val */
111 (*argp)++; 111 (*argp)++;
112 return cp; 112 return cp;
113 } 113 }
114 return NULL; 114 return NULL;
115 }
116
117 gchar*
118 get_progname(gchar * arg0)
119 {
120 gchar *p = arg0 + strlen(arg0) - 1;
121 while (p > arg0) {
122 if (*p == '/')
123 return p + 1;
124 p--;
125 }
126 return p;
127 } 115 }
128 116
129 gboolean 117 gboolean
130 write_pidfile(gchar * name) 118 write_pidfile(gchar * name)
131 { 119 {
398 address *return_path = NULL; /* may be changed by -f option */ 386 address *return_path = NULL; /* may be changed by -f option */
399 gchar *full_sender_name = NULL; 387 gchar *full_sender_name = NULL;
400 gboolean do_verbose = FALSE; 388 gboolean do_verbose = FALSE;
401 gint debug_level = -1; 389 gint debug_level = -1;
402 390
403 progname = get_progname(argv[0]); 391 /* strip the path part */
392 progname = strrchr(argc[0], '/');
393 progname = (progname) ? progname+1 : argc[0];
404 394
405 if (strcmp(progname, "mailq") == 0) { 395 if (strcmp(progname, "mailq") == 0) {
406 mta_mode = MODE_LIST; 396 mta_mode = MODE_LIST;
407 } else if (strcmp(progname, "mailrm") == 0) { 397 } else if (strcmp(progname, "mailrm") == 0) {
408 mta_mode = MODE_MCMD; 398 mta_mode = MODE_MCMD;
535 exit(EXIT_FAILURE); 525 exit(EXIT_FAILURE);
536 } 526 }
537 } 527 }
538 528
539 if (!mta_mode) { 529 if (!mta_mode) {
540 fprintf(stderr, "arg:%d argc:%d\n", arg, argc);
541 mta_mode = (arg<argc || opt_t) ? MODE_ACCEPT : MODE_VERSION; 530 mta_mode = (arg<argc || opt_t) ? MODE_ACCEPT : MODE_VERSION;
542 } 531 }
543 532
544 if (mta_mode == MODE_VERSION) { 533 if (mta_mode == MODE_VERSION) {
545 gchar *with_resolver = ""; 534 gchar *with_resolver = "";