crawl_folders.h: Base header on implementation.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 1b1fee3ca4ac8dc7da0a23725323afd4161571f9..83295af9625b2ffaf6502be677217256b367398e 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -1,17 +1,24 @@
-
-/*
- * ap.c -- parse addresses 822-style
+/* ap.c -- parse addresses 822-style

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/mts.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/getcpy.h"
+#include "sbr/ambigsw.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/terminal.h"

 
 #define        NADDRS  100
 
 
 #define        NADDRS  100
 


@@ -53,7 +60,7 @@ main (int argc, char **argv)
     char buf[BUFSIZ], **argp;
     char *addrs[NADDRS + 1]; /* Includes terminating NULL. */
 
     char buf[BUFSIZ], **argp;
     char *addrs[NADDRS + 1]; /* Includes terminating NULL. */
 

-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }

 
     mts_init ();
 
 
     mts_init ();
 


@@ -66,7 +73,7 @@ main (int argc, char **argv)
                    done (1);
 
                case UNKWNSW: 
                    done (1);
 
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] addrs ...",
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] addrs ...",


@@ -79,31 +86,30 @@ main (int argc, char **argv)
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    format = NULL;
                    continue;
                case FMTSW: 
                    if (!(format = *argp++) || *format == '-')
                    format = NULL;
                    continue;
                case FMTSW: 
                    if (!(format = *argp++) || *format == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    form = NULL;
                    continue;
 
                case WIDTHSW: 
                    if (!(cp = *argp++) || *cp == '-')
                    form = NULL;
                    continue;
 
                case WIDTHSW: 
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    width = atoi (cp);
                    continue;
            }
        }
        if (addrp == NADDRS)
                    width = atoi (cp);
                    continue;
            }
        }
        if (addrp == NADDRS)

-           adios (NULL, "more than %d addresses", NADDRS);
-       else
-           addrs[addrp++] = cp;
+           die("more than %d addresses", NADDRS);
+        addrs[addrp++] = cp;

     }
     addrs[addrp] = NULL;
 
     if (addrp == 0)
     }
     addrs[addrp] = NULL;
 
     if (addrp == 0)

-       adios (NULL, "usage: %s [switches] addrs ...", invo_name);
+       die("usage: %s [switches] addrs ...", invo_name);

 
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);
 
     /* get new format string */
     nfs = new_fs (form, format, FORMAT);


@@ -130,7 +136,7 @@ main (int argc, char **argv)
        status += process (addrs[addrp], width);
 
     fmt_free (fmt, 1);
        status += process (addrs[addrp], width);
 
     fmt_free (fmt, 1);

-    done (status);
+    done(!!status);

     return 1;
 }
 
     return 1;
 }
 


@@ -173,13 +179,13 @@ process (char *arg, int length)
 
        cptr = fmt_findcomp ("text");
        if (cptr) {
 
        cptr = fmt_findcomp ("text");
        if (cptr) {

-            mh_xfree(cptr->c_text);
+            free(cptr->c_text);

            cptr->c_text = p->pq_text;
            p->pq_text = NULL;
        }
        cptr = fmt_findcomp ("error");
        if (cptr) {
            cptr->c_text = p->pq_text;
            p->pq_text = NULL;
        }
        cptr = fmt_findcomp ("error");
        if (cptr) {

-            mh_xfree(cptr->c_text);
+            free(cptr->c_text);

            cptr->c_text = p->pq_error;
            p->pq_error = NULL;
        }
            cptr->c_text = p->pq_error;
            p->pq_error = NULL;
        }


@@ -188,8 +194,8 @@ process (char *arg, int length)
        fputs (charstring_buffer (scanl), stdout);
        charstring_free (scanl);
 
        fputs (charstring_buffer (scanl), stdout);
        charstring_free (scanl);
 

-        mh_xfree(p->pq_text);
-        mh_xfree(p->pq_error);
+        free(p->pq_text);
+        free(p->pq_error);

        q = p->pq_next;
        free(p);
     }
        q = p->pq_next;
        free(p);
     }