From 2968a0027b4c64664076f0d03a37f9744fe26782 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Sat, 24 Mar 2012 11:14:42 +0100
Subject: [PATCH] whatnow: alist will now always list in long and numbered
 format.

---
 man/whatnow.man1 |    4 ++--
 uip/whatnow.c    |   57 +++++++++++-------------------------------------------
 2 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/man/whatnow.man1 b/man/whatnow.man1
index 9274246..36844a0 100644
--- a/man/whatnow.man1
+++ b/man/whatnow.man1
@@ -85,8 +85,8 @@ list files in the attachment working directory using the ls command
 .B attach files
 add the named files to the draft as MIME attachments
 .TP \w'refilezzzzfolderz'u
-.B alist [-ln]
-list the MIME attachments, either short, long [-l] or numbered [-n]
+.B alist
+list the MIME attachments
 .TP \w'refilezzzzfolderz'u
 .B detach [-n] files-or-numbers
 remove MIME attachments, either by file name or by number with -n
diff --git a/uip/whatnow.c b/uip/whatnow.c
index ae0c30b..75d9a9b 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -28,9 +28,8 @@
 **        attach files            This option attaches the named files to
 **                                the draft.
 **
-**        alist [-ln]             This option lists the attachments on the
-**                                draft.  -l gets long listings, -n gets
-**                                numbered listings.
+**        alist                   This option lists the attachments on the
+**                                draft.
 **
 **        detach files            This option removes attachments from the
 **        detach -n numbers       draft.  This can be done by file name or
@@ -86,9 +85,9 @@ static struct swit aleqs[] = {
 #define ATTACHCMDSW  11
 	{ "attach", 0 },
 #define DETACHCMDSW  12
-	{ "detach [-n]", 2 },
+	{ "detach [-n]", 0 },
 #define ALISTCMDSW  13
-	{ "alist [-ln] ", 2 },
+	{ "alist", 0 },
 	{ NULL, 0 }
 };
 
@@ -125,8 +124,7 @@ main(int argc, char **argv)
 	char file[MAXPATHLEN + 1];  /* file name buffer */
 	char shell[MAXPATHLEN + 1];  /* shell response buffer */
 	FILE *f;  /* read pointer for bgnd proc */
-	char *l;  /* set on -l to alist  command */
-	int n;  /* set on -n to alist command */
+	int n;  /* set on -n to detach command */
 
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
@@ -319,47 +317,14 @@ main(int argc, char **argv)
 
 		case ALISTCMDSW:
 			/*
-			** List attachments on current draft.  Options are:
-			**
-			** -l    long listing (full path names)
-			** -n    numbers listing
+			** List attachments on current draft.
 			*/
-
-			l = NULL;
-			n = 0;
-
-			while (*++argp) {
-				if (strcmp(*argp, "-l") == 0)
-					l = "/";
-
-				else if (strcmp(*argp, "-n") == 0)
-					n = 1;
-
-				else if (strcmp(*argp, "-ln") == 0 ||
-						strcmp(*argp, "-nl") == 0) {
-					l = "/";
-					n = 1;
-				} else {
-					n = -1;
-					break;
-				}
+			snprintf(buf, sizeof buf, "anno -list -comp '%s' "
+					"-number all -text IGNORE '%s'",
+					attach_hdr, drft);
+			if (system(buf) != 0) {
+				advise(NULL, "Could not list attachment headers.");
 			}
-
-			if (n == -1)
-				advise(NULL, "usage is alist [-ln].");
-
-			else
-				snprintf(buf, sizeof buf,
-						"anno -list -comp '%s' "
-						"%s%s '%s'",
-						attach_hdr,
-						n ? "-number all" : "",
-						l ? "-text IGNORE " : "",
-						drft);
-				if (system(buf) != 0) {
-					advise(NULL, "Could not list attachment headers.");
-				}
-
 			break;
 
 		case ATTACHCMDSW:
-- 
1.7.10.4