From: Ben Schmidt <none@none>
Date: Thu, 7 Oct 2010 14:47:46 +0000 (+1100)
Subject: Cosmetic changes to help messages
X-Git-Tag: RELEASE_1_2_18a1~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=212d4ce06b4a69d955bca54ad376de1eaa5bc2d9;p=thirdparty%2Fmlmmj.git

Cosmetic changes to help messages
---

diff --git a/src/mlmmj-bounce.c b/src/mlmmj-bounce.c
index 89047414..6a817a8b 100644
--- a/src/mlmmj-bounce.c
+++ b/src/mlmmj-bounce.c
@@ -223,13 +223,14 @@ char *dsnparseaddr(const char *mailname)
 
 static void print_help(const char *prg)
 {
-	printf("Usage: %s -L /path/to/list -a john=doe.org [-n num | -p]\n"
-		" -a: Address string that bounces\n"
-		" -h: This help\n"
-		" -L: Full path to list directory\n"
-		" -n: Message number in the archive\n"
-		" -p: Send out a probe\n"
-		" -V: Print version\n", prg);
+	printf("Usage: %s -L /path/to/list\n"
+	       "       -a john=doe.org [-n num | -p]\n"
+	       " -a: Address string that bounces\n"
+	       " -h: This help\n"
+	       " -L: Full path to list directory\n"
+	       " -n: Message number in the archive\n"
+	       " -p: Send out a probe\n"
+	       " -V: Print version\n", prg);
 
 	exit(EXIT_SUCCESS);
 }
diff --git a/src/mlmmj-list.c b/src/mlmmj-list.c
index c1e42fc1..2337e6a6 100644
--- a/src/mlmmj-list.c
+++ b/src/mlmmj-list.c
@@ -39,8 +39,8 @@
 
 static void print_help(const char *prg)
 {
-        printf("Usage: %s -L /path/to/listdir [-c] [-d] [-h] [-m] [-n] "
-			"[-o] [-s] [-V]\n"
+	printf("Usage: %s -L /path/to/listdir\n"
+	       "       [-c] [-d] [-h] [-m] [-n] [-o] [-s] [-V]\n"
 	       " -L: Full path to list directory\n"
 	       " -c: Print subscriber count\n"
 	       " -d: Print for digesters list\n"
diff --git a/src/mlmmj-process.c b/src/mlmmj-process.c
index 0a488d1f..ca2f88f7 100644
--- a/src/mlmmj-process.c
+++ b/src/mlmmj-process.c
@@ -368,7 +368,8 @@ static char *recipient_extra(const char *listdir, const char *addr)
 
 static void print_help(const char *prg)
 {
-        printf("Usage: %s -L /path/to/list -m /path/to/mail [-h] [-P] [-V]\n"
+	printf("Usage: %s -L /path/to/list\n"
+	       "       -m /path/to/mail [-h] [-P] [-V]\n"
 	       " -h: This help\n"
 	       " -L: Full path to list directory\n"
 	       " -m: Full path to mail file\n"
diff --git a/src/mlmmj-receive.c b/src/mlmmj-receive.c
index 29151af2..b67de9a2 100644
--- a/src/mlmmj-receive.c
+++ b/src/mlmmj-receive.c
@@ -42,7 +42,8 @@ extern char *optarg;
 
 static void print_help(const char *prg)
 {
-        printf("Usage: %s -L /path/to/listdir [-s sender@example.org] [-e extension] [-h] [-V] [-P] [-F]\n"
+	printf("Usage: %s -L /path/to/listdir\n"
+	       "       [-s sender@example.org] [-e extension] [-h] [-V] [-P] [-F]\n"
 	       " -h: This help\n"
 	       " -F: Don't fork in the background\n"
 	       " -L: Full path to list directory\n"
diff --git a/src/mlmmj-send.c b/src/mlmmj-send.c
index 32441e63..445799b8 100644
--- a/src/mlmmj-send.c
+++ b/src/mlmmj-send.c
@@ -672,9 +672,10 @@ int send_mail_many_list(int sockfd, const char *from, const char *replyto,
 
 static void print_help(const char *prg)
 {
-	printf("Usage: %s [-L /path/to/list || -l listctrl] \n"
-	       "       -m /path/to/mail [-a] [-D] [-F] [-h] [-o] [-r] [-R] "
-	       "[-R] [-s] [-T] [-V]\n"
+	printf("Usage: %s [-L /path/to/list -m /path/to/mail | -l listctrl]\n"
+	       "       [-a] [-D] [-F sender@example.org] [-h] [-o address@example.org]\n"
+	       "       [-r 127.0.0.1] [-R reply@example.org] [-s /path/to/subscribers]\n"
+	       "       [-T recipient@example.org] [-V]\n"
 	       " -a: Don't archive the mail\n"
 	       " -D: Don't delete the mail after it's sent\n"
 	       " -F: What to use as MAIL FROM:\n"
@@ -686,8 +687,8 @@ static void print_help(const char *prg)
 	       "    '4' means 'send to file with recipients'\n"
 	       "    '5' means 'bounceprobe'\n"
 	       "    '6' means 'single listmail to single recipient'\n"
-	       "    '7' means 'digest'\n"
-	       " -L: Full path to list directory\n"
+	       "    '7' means 'digest'\n");
+	printf(" -L: Full path to list directory\n"
 	       " -m: Full path to mail file\n"
 	       " -o: Address to omit from distribution (normal mail only)\n"
 	       " -r: Relayhost IP address (defaults to 127.0.0.1)\n"