Updated

4 files changed, 109 insertions, 72 deletions

diff --git a/ChangeLog b/ChangeLog
index 13c5c1435..2a6000d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-10  Sergey Poznyakoff 
+
+	* comsat/comsat.c: Use ngettext.
+	* mh/sortm.c: New file. Source for the sortm utility.
+	* mh/.cvsignore: Added sortm
+	* mh/Makefile.am: Likewise
+	* mh/README: Updated
+	* mh/TODO: Updated
+	* mh/mh_getopt.h: Updated
+	
 2003-03-03  Sergey Poznyakoff
 
 	* configure.ac: New option --with-included-argp
diff --git a/mh/README b/mh/README
index c248a47f1..eea655912 100644
--- a/mh/README
+++ b/mh/README
@@ -158,6 +158,25 @@ compatibility only.
 
 ** Message specs and folder names may be interspersed.
 
+* sortm
+
+** New option --numfield specifies numeric comparison for the given field.
+
+** Any number of --datefield, --textfield and --numfield options may be
+given, thus allowing to build sort criteria of arbitrary complexity.
+
+** The order of --.*field arguments sets the ordering priority. This
+differs from the behaviour of the standard sortm, which always orders
+datefield-major, textfield-minor.
+
+** Apart from sorting the mailfolder the following actions may be
+specified:
+ --list     list the ordered messages using a format string given
+	    by --form or --format option.
+ --dry-run  do not actually sort messages, rather print what would
+            have been done. This is useful for debugging purposes.
+
+
 
 Local variables:
 mode: outline
diff --git a/mh/TODO b/mh/TODO
index 5e5055154..068fac721 100644
--- a/mh/TODO
+++ b/mh/TODO
@@ -40,7 +40,7 @@ State	Nice	Utility		Comments
 -	10	whom
 +	10	mhpath
 +	10	whatnow		
--	20	sortm
++	20	sortm
 
 Utilities In Alphabetical Order
 ===============================
diff --git a/mh/mh_getopt.h b/mh/mh_getopt.h
index c542823a8..f4d2146fe 100644
--- a/mh/mh_getopt.h
+++ b/mh/mh_getopt.h
@@ -63,77 +63,85 @@ struct mh_argp_data
 #define ARG_DRAFT		279
 #define ARG_DRAFTFOLDER		280
 #define ARG_DRAFTMESSAGE	281
-#define ARG_DUMP		282
-#define ARG_EDITOR		283
-#define ARG_FAST		284
-#define ARG_FCC		        285
-#define ARG_FILE		286
-#define ARG_FILTER		287
-#define ARG_FOLDER		288
-#define ARG_FORM		289
-#define ARG_FORMAT		290
-#define ARG_FORWARD		291
-#define ARG_FROM		292
-#define ARG_HEADER		293
-#define ARG_INPLACE		294
-#define ARG_INTERACTIVE		295
-#define ARG_LBRACE		296
-#define ARG_LENGTH		297
-#define ARG_LICENSE		298
-#define ARG_LINK		299
-#define ARG_LIST		300
-#define ARG_MIME		301
-#define ARG_MOREPROC		302
-#define ARG_MSGID		303
-#define ARG_NOAUDIT		304
-#define ARG_NOBELL		305
-#define ARG_NOCC		306
-#define ARG_NOCLEAR		307
-#define ARG_NODATE		308
-#define ARG_NODRAFTFOLDER	309
-#define ARG_NOEDIT		310
-#define ARG_NOFILTER		311
-#define ARG_NOFORMAT		312
-#define ARG_NOFORWARD		313
-#define ARG_NOINPLACE		314
-#define ARG_NOLIST		315
-#define ARG_NOMIME		316
-#define ARG_NOMOREPROC		317
-#define ARG_NOMSGID		318
-#define ARG_NOPUBLIC		319
-#define ARG_NOPUSH		320
-#define ARG_NOT		        321
-#define ARG_NOVERBOSE		322
-#define ARG_NOWATCH		323
-#define ARG_NOWHATNOWPROC	324
-#define ARG_NOZERO		325
-#define ARG_OR		        326
-#define ARG_PATTERN		327
-#define ARG_POP		        328
-#define ARG_PRESERVE		329
-#define ARG_PRINT		330
-#define ARG_PROMPT		331
-#define ARG_PUBLIC		332
-#define ARG_PUSH		333
-#define ARG_QUERY		334
-#define ARG_QUIET		335
-#define ARG_RBRACE		336
-#define ARG_RECURSIVE		337
-#define ARG_REVERSE		338
-#define ARG_SEQUENCE		339
-#define ARG_SOURCE		340
-#define ARG_SPLIT		341
-#define ARG_SUBJECT		342
-#define ARG_TEXT		343
-#define ARG_TO		        344
-#define ARG_TOTAL		345
-#define ARG_TRUNCATE		346
-#define ARG_USE		        347
-#define ARG_VERBOSE		348
-#define ARG_WATCH		349
-#define ARG_WHATNOWPROC		350
-#define ARG_WIDTH		351
-#define ARG_ZERO		352
+#define ARG_DRY_RUN             282
+#define ARG_DUMP		283
+#define ARG_EDITOR		284
+#define ARG_FAST		285
+#define ARG_FCC		        286
+#define ARG_FILE		287
+#define ARG_FILTER		288
+#define ARG_FOLDER		289
+#define ARG_FORM		290
+#define ARG_FORMAT		291
+#define ARG_FORWARD		292
+#define ARG_FROM		293
+#define ARG_HEADER		294
+#define ARG_INPLACE		295
+#define ARG_INTERACTIVE		296
+#define ARG_LBRACE		297
+#define ARG_LENGTH		298
+#define ARG_LICENSE		299
+#define ARG_LINK		300
+#define ARG_LIMIT               301
+#define ARG_LIST		302
+#define ARG_MIME		303
+#define ARG_MOREPROC		304
+#define ARG_MSGID		305
+#define ARG_NOAUDIT		306
+#define ARG_NOBELL		307
+#define ARG_NOCC		308
+#define ARG_NOCLEAR		309
+#define ARG_NODATE		310
+#define ARG_NODATEFIELD         311
+#define ARG_NODRAFTFOLDER	312
+#define ARG_NOEDIT		313
+#define ARG_NOFILTER		314
+#define ARG_NOFORMAT		315
+#define ARG_NOFORWARD		316
+#define ARG_NOINPLACE		317
+#define ARG_NOLIMIT             318
+#define ARG_NOLIST		319
+#define ARG_NOMIME		320
+#define ARG_NOMOREPROC		321
+#define ARG_NOMSGID		322
+#define ARG_NOPUBLIC		323
+#define ARG_NOPUSH		324
+#define ARG_NOT		        325
+#define ARG_NOTEXTFIELD         326
+#define ARG_NOVERBOSE		327
+#define ARG_NOWATCH		328
+#define ARG_NOWHATNOWPROC	329
+#define ARG_NOZERO		330
+#define ARG_NUMFIELD            331
+#define ARG_OR		        332
+#define ARG_PATTERN		333
+#define ARG_POP		        334
+#define ARG_PRESERVE		335
+#define ARG_PRINT		336
+#define ARG_PROMPT		337
+#define ARG_PUBLIC		338
+#define ARG_PUSH		339
+#define ARG_QUERY		340
+#define ARG_QUIET		341
+#define ARG_RBRACE		342
+#define ARG_RECURSIVE		343
+#define ARG_REORDER             344 
+#define ARG_REVERSE		345 
+#define ARG_SEQUENCE		346 
+#define ARG_SOURCE		347 
+#define ARG_SPLIT		348 
+#define ARG_SUBJECT		349 
+#define ARG_TEXT		350 
+#define ARG_TEXTFIELD           351 
+#define ARG_TO		        352 
+#define ARG_TOTAL		353 
+#define ARG_TRUNCATE		354 
+#define ARG_USE		        355 
+#define ARG_VERBOSE		356 
+#define ARG_WATCH		357 
+#define ARG_WHATNOWPROC		358 
+#define ARG_WIDTH		359 
+#define ARG_ZERO		360
 
 void mh_argv_preproc __P((int argc, char **argv, struct mh_argp_data *data));
 int mh_getopt __P((int argc, char **argv, struct mh_option *mh_opt,