expect this commit to be force-replaced periodically

[nmh] / uip / mhlistsbr.c

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 968229c6641e5f14fcdd8c717b7630ec9daffc46..68cd4d270d5907b8ff680d3176dcad3123a8e9bb 100644 (file)
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -6,18 +6,16 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
+#include "h/mh.h"
+#include "sbr/r1bindex.h"
+#include "sbr/trimcpy.h"

 #include <fcntl.h>
 #include <fcntl.h>

-#include <h/mts.h>
-#include <h/tws.h>
-#include <h/mime.h>
-#include <h/mhparse.h>
-#include <h/utils.h>
-
-/* mhmisc.c */
-int part_ok (CT);
-int type_ok (CT, int);
-void flush_errors (void);
+#include "h/mts.h"
+#include "h/tws.h"
+#include "h/mime.h"
+#include "h/mhparse.h"
+#include "h/utils.h"
+#include "mhmisc.h"

 
 /*
  * static prototypes
 
 /*
  * static prototypes


@@ -25,7 +23,6 @@ void flush_errors (void);
 static void list_single_message (CT, int, int, int, int);
 static int list_debug (CT);
 static int list_multi (CT, int, int, int, int, int);
 static void list_single_message (CT, int, int, int, int);
 static int list_debug (CT);
 static int list_multi (CT, int, int, int, int, int);

-static int list_partial (CT, int, int, int, int, int);

 static int list_external (CT, int, int, int, int, int);
 static int list_encoding (CT);
 
 static int list_external (CT, int, int, int, int, int);
 static int list_encoding (CT);
 


@@ -102,10 +99,6 @@ list_switch (CT ct, int toplevel, int realsize, int verbose, int debug,
 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
 
        case CT_MESSAGE:
            switch (ct->c_subtype) {

-               case MESSAGE_PARTIAL:
-                   return list_partial (ct, toplevel, realsize, verbose,
-                                        debug, dispo);
-

                case MESSAGE_EXTERNAL:
                    return list_external (ct, toplevel, realsize, verbose,
                                          debug, dispo);
                case MESSAGE_EXTERNAL:
                    return list_external (ct, toplevel, realsize, verbose,
                                          debug, dispo);


@@ -143,9 +136,9 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug,
     PM pm;
 
     if (toplevel > 0)
     PM pm;
 
     if (toplevel > 0)

-       printf (LSTFMT2a, atoi (r1bindex (FENDNULL(ct->c_file), '/')));
+       printf (LSTFMT2a, atoi (r1bindex (FENDNULL(ct->c_file), '/')));

     else
     else

-       printf(toplevel < 0 ? "part " : "     ");
+       printf(toplevel < 0 ? "part " : "     ");

 
     snprintf (buffer, sizeof(buffer), "%s/%s", FENDNULL(ci->ci_type),
                FENDNULL(ci->ci_subtype));
 
     snprintf (buffer, sizeof(buffer), "%s/%s", FENDNULL(ci->ci_type),
                FENDNULL(ci->ci_subtype));


@@ -200,7 +193,7 @@ list_content (CT ct, int toplevel, int realsize, int verbose, int debug,
 
        for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
            printf ("\t     %s=\"%s\"\n", pm->pm_name,
 
        for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) {
            printf ("\t     %s=\"%s\"\n", pm->pm_name,

-                   get_param_value(pm, '?'));
+                   get_param_value(pm, '?'));

        }
 
        /*
        }
 
        /*


@@ -338,28 +331,6 @@ list_multi (CT ct, int toplevel, int realsize, int verbose, int debug,
 }
 
 
 }
 
 

-/*
- * list content information for type "message/partial"
- */
-
-static int
-list_partial (CT ct, int toplevel, int realsize, int verbose, int debug,
-             int dispo)
-{
-    struct partial *p = (struct partial *) ct->c_ctparams;
-
-    list_content (ct, toplevel, realsize, verbose, debug, dispo);
-    if (verbose) {
-       printf ("\t     [message %s, part %d", p->pm_partid, p->pm_partno);
-       if (p->pm_maxno)
-           printf (" of %d", p->pm_maxno);
-       puts("]");
-    }
-
-    return OK;
-}
-
-

 /*
  * list content information for type "message/external"
  */
 /*
  * list content information for type "message/external"
  */