Move #include from h/mh.h to source files

[mmh] / uip / folder.c

diff --git a/uip/folder.c b/uip/folder.c
index 8638151..84b4365 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -12,6 +12,8 @@
 #include <h/crawl_folders.h>
 #include <h/utils.h>
 #include <errno.h>
+#include <unistd.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define ALLSW  0
@@ -136,17 +138,18 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               /*sysexits.h EX_USAGE*/
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [msg] [switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case ALLSW:
                                all = 1;
@@ -314,8 +317,9 @@ main(int argc, char **argv)
                }
                printf("\n");
 
-               if (!printsw)
-                       done(0);
+               if (!printsw) {
+                       exit(0);
+               }
        }
 
        /* Allocate initial space to record folder information */
@@ -365,7 +369,7 @@ main(int argc, char **argv)
                ** Check if folder exists.  If not, then see if
                ** we should create it, or just exit.
                */
-               create_folder(toabsdir(folder), fcreat, done);
+               create_folder(toabsdir(folder), fcreat, exit);
 
                if (get_folder_info(folder, msg) && argfolder) {
                        /* update current folder */
@@ -379,8 +383,7 @@ main(int argc, char **argv)
        print_folders();
 
        context_save();
-       done(0);
-       return 1;
+       return 0;
 }
 
 static int
@@ -422,8 +425,9 @@ get_folder_info_body(char *fold, char *msg, boolean *crawl_children)
                        retval = 0;
 
                if (fpack) {
-                       if (folder_pack(&mp, fverb) == -1)
-                               done(1);
+                       if (folder_pack(&mp, fverb) == -1) {
+                               exit(0);
+                       }
                        seq_save(mp);  /* synchronize the sequences */
                        context_save();  /* save the context file */
                }