]> git.deb.at Git - pkg/abook.git/commitdiff
getopt + fixes
authorJaakko Heinonen <jheinonen@users.sourceforge.net>
Tue, 5 Feb 2002 11:53:01 +0000 (11:53 +0000)
committerJaakko Heinonen <jheinonen@users.sourceforge.net>
Tue, 5 Feb 2002 11:53:01 +0000 (11:53 +0000)
19 files changed:
ChangeLog
Makefile.am
Makefile.in
TODO
abook.c
conff.c
configure
configure.in
database.c
edit.c
estr.c
filter.c
filter.h
getopt.c [new file with mode: 0644]
getopt.h [new file with mode: 0644]
getopt1.c [new file with mode: 0644]
misc.c
options.c
ui.c

index d1e5cc682e283de7e7e17a8b5a91c88fecf5e023..ea55e01543a3efc96c9c7da2400d5ca6dc837461 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-0.4.16-cvs
+2002-xx-xx
+ - abook can be compiled with g++
+
+2002-02-04
+ - use getopt to parse command line (also new options added)
  - use strcoll instead of strcmp for sorting entries
  - html filter fix
  - bugfixes
index a376bf337e0ffd5124893cd9624c159a0861123b..0391bc3ec10dd42d15c194dbc1d5e05b0c604df6 100644 (file)
@@ -3,8 +3,10 @@ bin_PROGRAMS = abook
 
 abook_SOURCES = abook.c database.c filter.c list.c misc.c conff.c \
                options.c edit.c ldif.c estr.c ui.c getname.c \
+               getopt.c getopt1.c \
                abook.h database.h filter.h list.h misc.h help.h conff.h \
-               options.h edit.h ldif.h estr.h abook_curses.h ui.h getname.h
+               options.h edit.h ldif.h estr.h abook_curses.h ui.h getname.h \
+               getopt.h
 
 EXTRA_DIST = ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc
 
index d89e2f58c4efd8cf78d2f46731eee64004d59ddf..30d009c59e0dec2e229dd77abb4d3688bcb2988e 100644 (file)
@@ -68,7 +68,7 @@ VERSION = @VERSION@
 
 bin_PROGRAMS = abook
 
-abook_SOURCES = abook.c database.c filter.c list.c misc.c conff.c              options.c edit.c ldif.c estr.c ui.c getname.c           abook.h database.h filter.h list.h misc.h help.h conff.h                options.h edit.h ldif.h estr.h abook_curses.h ui.h getname.h
+abook_SOURCES = abook.c database.c filter.c list.c misc.c conff.c              options.c edit.c ldif.c estr.c ui.c getname.c           getopt.c getopt1.c              abook.h database.h filter.h list.h misc.h help.h conff.h                options.h edit.h ldif.h estr.h abook_curses.h ui.h getname.h            getopt.h
 
 
 EXTRA_DIST = ANNOUNCE BUGS FAQ abook.1 abookrc.5 sample.abookrc
@@ -84,7 +84,7 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 abook_OBJECTS =  abook.o database.o filter.o list.o misc.o conff.o \
-options.o edit.o ldif.o estr.o ui.o getname.o
+options.o edit.o ldif.o estr.o ui.o getname.o getopt.o getopt1.o
 abook_LDADD = $(LDADD)
 abook_DEPENDENCIES = 
 abook_LDFLAGS = 
@@ -103,8 +103,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 TAR = tar
 GZIP_ENV = --best
 DEP_FILES =  .deps/abook.P .deps/conff.P .deps/database.P .deps/edit.P \
-.deps/estr.P .deps/filter.P .deps/getname.P .deps/ldif.P .deps/list.P \
-.deps/misc.P .deps/options.P .deps/ui.P
+.deps/estr.P .deps/filter.P .deps/getname.P .deps/getopt.P \
+.deps/getopt1.P .deps/ldif.P .deps/list.P .deps/misc.P .deps/options.P \
+.deps/ui.P
 SOURCES = $(abook_SOURCES)
 OBJECTS = $(abook_OBJECTS)
 
diff --git a/TODO b/TODO
index feff60d8ca1f245e9ee1870f37d8819c8f03d49c..eaddd222d004b24c975100a3dbfbbb9391f4f35e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
- general:
- - update TODO list
- - colors                      0.8 - 1.0 ?
- - custom fields               (partially done)
+
+0.5
+ - new file format (xml?)
+ - new configuration system (maybe not yet in 0.5)
+   - custom views, keybindings
 
diff --git a/abook.c b/abook.c
index c7efa0992a9a96bf49e9ee253e6d51f8b16a8303..7b119b9b6c8b9174fbd0316e1660ede2c0881450 100644 (file)
--- a/abook.c
+++ b/abook.c
 #include "misc.h"
 #include "options.h"
 #include "getname.h"
+#include "getopt.h"
+#include <assert.h>
 
 static void             init_abook();
+static void            quit_abook_sig(int i);
 static void             set_filenames();
 static void            free_filenames();
 static void             parse_command_line(int argc, char **argv);
 static void             show_usage();
 static void             mutt_query(char *str);
 static void             init_mutt_query();
-static void             quit_mutt_query();
 static void            convert(char *srcformat, char *srcfile,
                                char *dstformat, char *dstfile);
 static void            add_email(int);
@@ -49,8 +51,8 @@ init_abook()
        set_filenames();
        init_options();
 
-       signal(SIGKILL, quit_abook);
-       signal(SIGTERM, quit_abook);
+       signal(SIGKILL, quit_abook_sig);
+       signal(SIGTERM, quit_abook_sig);
        
        if( init_ui() )
                exit(1);
@@ -97,6 +99,12 @@ quit_abook()
        exit(0);
 }
 
+static void
+quit_abook_sig(int i)
+{
+       quit_abook();
+}
+
 int
 main(int argc, char **argv)
 {
@@ -125,10 +133,11 @@ set_filenames()
                exit(1);
        }
 
-       if (!datafile)
+       if(!datafile)
                datafile = strconcat(getenv("HOME"), "/" DATAFILE, NULL);
 
-       rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
+       if(!rcfile)
+               rcfile = strconcat(getenv("HOME"), "/" RCFILE, NULL);
 
        atexit(free_filenames);
 }
@@ -140,51 +149,164 @@ free_filenames()
        my_free(datafile);
 }
 
+/*
+ * CLI
+ */
+
+enum {
+       MODE_CONT,
+       MODE_ADD_EMAIL,
+       MODE_ADD_EMAIL_QUIET,
+       MODE_QUERY,
+       MODE_CONVERT
+};
+
+static void
+change_mode(int *current, int mode)
+{
+       if(*current != MODE_CONT) {
+               fprintf(stderr, "Cannot combine options --mutt-query, "
+                               "--convert, "
+                               "--add-email or --add-email-quiet\n");
+               exit(1);
+       }
+
+       *current = mode;
+}
+
+void
+set_filename(char **var, char *path)
+{
+       char *cwd;
+       
+       assert(var != NULL);
+       assert(*var == NULL); /* or else we probably leak memory */
+       assert(path != NULL);
+       
+       if(*path == '/') {
+               *var = strdup(path);
+               return;
+       }
+
+       cwd = my_getcwd();
+
+       *var = strconcat(cwd, path, NULL);
+
+       free(cwd);
+}
+
+#define set_convert_var(X) do { if(mode != MODE_CONVERT) {\
+       fprintf(stderr, "please use option --%s after --convert option\n",\
+                       long_options[option_index].name);\
+               exit(1);\
+       } else\
+               X = optarg;\
+       } while(0)
+
 static void
 parse_command_line(int argc, char **argv)
 {
-       int i;
+       int mode = MODE_CONT;
+       char *query_string = NULL;
+       char *informat = "abook",
+               *outformat = "text",
+               *infile = "-",
+               *outfile = "-";
+       int c;
+
+       for(;;) {
+               int option_index = 0;
+               enum {
+                       OPT_ADD_EMAIL,
+                       OPT_ADD_EMAIL_QUIET,
+                       OPT_MUTT_QUERY,
+                       OPT_CONVERT,
+                       OPT_INFORMAT,
+                       OPT_OUTFORMAT,
+                       OPT_INFILE,
+                       OPT_OUTFILE,
+                       OPT_FORMATS
+               };
+               static struct option long_options[] = {
+                       { "help", 0, 0, 'h' },
+                       { "add-email", 0, 0, OPT_ADD_EMAIL },
+                       { "add-email-quiet", 0, 0, OPT_ADD_EMAIL_QUIET },
+                       { "datafile", 1, 0, 'f' },
+                       { "mutt-query", 1, 0, OPT_MUTT_QUERY },
+                       { "config", 1, 0, 'C' },
+                       { "convert", 0, 0, OPT_CONVERT },
+                       { "informat", 1, 0, OPT_INFORMAT },
+                       { "outformat", 1, 0, OPT_OUTFORMAT },
+                       { "infile", 1, 0, OPT_INFILE },
+                       { "outfile", 1, 0, OPT_OUTFILE },
+                       { "formats", 0, 0, OPT_FORMATS },
+                       { 0, 0, 0, 0 }
+               };
+
+               c = getopt_long(argc, argv, "hC:",
+                               long_options, &option_index);
+
+               if(c == -1)
+                       break;
 
-       for( i = 1; i < argc; i++ ) {
-               if( !strcmp(argv[i], "--help") ) {
-                       show_usage();
-                       exit(1);
-               } else if( !strcmp(argv[i], "--mutt-query") ) {
-                       mutt_query(argv[i + 1]);
-               } else if( !strcmp(argv[i], "--datafile") ) {
-                       if (argc > i + 1 ) {
-                               if (argv[i+1][0] != '/') {
-                                       char *cwd = my_getcwd();
-                                       datafile = strconcat(cwd, "/", argv[i+1], NULL);
-                                       free(cwd);
-                               } else {
-                                       datafile = strdup(argv[i+1]);
-                               }
-                               i++;
-                       } else {
+               switch(c) {
+                       case 'h':
                                show_usage();
                                exit(1);
-                       }
-               } else if( !strcmp(argv[i], "--convert") ) {
-                       if( argc < 5 || argc > 6 ) {
-                               fprintf(stderr, "incorrect number of argumets to make conversion\n");
-                               fprintf(stderr, "try %s --help\n", argv[0]);
+                       case OPT_ADD_EMAIL:
+                               change_mode(&mode, MODE_ADD_EMAIL);
+                               break;
+                       case OPT_ADD_EMAIL_QUIET:
+                               change_mode(&mode, MODE_ADD_EMAIL_QUIET);
+                               break;
+                       case 'f':
+                               set_filename(&datafile, optarg);
+                               break;
+                       case OPT_MUTT_QUERY:
+                               query_string = optarg;
+                               change_mode(&mode, MODE_QUERY);
+                               break;
+                       case 'C':
+                               set_filename(&rcfile, optarg);
+                               break;
+                       case OPT_CONVERT:
+                               change_mode(&mode, MODE_CONVERT);
+                               break;
+                       case OPT_INFORMAT:
+                               set_convert_var(informat);
+                               break;
+                       case OPT_OUTFORMAT:
+                               set_convert_var(outformat);
+                               break;
+                       case OPT_INFILE:
+                               set_convert_var(infile);
+                               break;
+                       case OPT_OUTFILE:
+                               set_convert_var(outfile);
+                               break;
+                       case OPT_FORMATS:
+                               print_filters();
+                               exit(0);
+                       default:
                                exit(1);
-                       }
-                       if( argc > i + 4 )
-                               convert(argv[i+1], argv[i+2],
-                                       argv[i+3], argv[i+4]);
-                       else
-                               convert(argv[i+1], argv[i+2], argv[i+3], "-");
-               } else if( !strcmp(argv[i], "--add-email") ) {
+               }
+       }
+
+       if (optind < argc) {
+               fprintf(stderr, "%s: unrecognized arguments on command line\n",
+                               argv[0]);
+               exit(1);
+       }
+
+       switch(mode) {
+               case MODE_ADD_EMAIL:
                        add_email(0);
-               } else if( !strcmp(argv[i], "--add-email-quiet") ) {
+               case MODE_ADD_EMAIL_QUIET:
                        add_email(1);
-               } else {
-                       printf("option %s not recognized\n", argv[i]);
-                       printf("try %s --help\n", argv[0]);
-                       exit(1);
-               }
+               case MODE_QUERY:
+                       mutt_query(query_string);
+               case MODE_CONVERT:
+                       convert(informat, infile, outformat, outfile);
        }
 }
 
@@ -193,11 +315,10 @@ static void
 show_usage()
 {
        puts    (PACKAGE " v " VERSION "\n");
-       puts    ("      --help                          show usage");
-       puts    ("      --datafile      <filename>      use an alternative addressbook file");
+       puts    ("     -h       --help                          show usage");
+       puts    ("     -C       --config        <file>          use an alternative configuration file");   
+       puts    ("      --datafile      <file>          use an alternative addressbook file");
        puts    ("      --mutt-query    <string>        make a query for mutt");
-       puts    ("      --convert       <inputformat> <inputfile> "
-               "<outputformat> <outputfile>");
        puts    ("      --add-email                     "
                        "read an e-mail message from stdin and\n"
                "                                       "
@@ -206,15 +327,34 @@ show_usage()
                "same as --add-email but doesn't\n"
                "                                       confirm adding");
        putchar('\n');
-       puts    ("available formats for --convert option:");
-       print_filters();
-#ifdef DEBUG
-       puts    ("\nWarning: this version compiled with DEBUG flag ON");
-#endif
+       puts    ("      --convert                       convert address book files");
+       puts    ("      options to use with --convert:");
+       puts    ("      --informat      <format>        format for input file");
+       puts    ("                                      (default: abook)");
+       puts    ("      --infile        <file>          source file");
+       puts    ("                                      (default: stdin)");
+       puts    ("      --outformat     <format>        format for output file");
+       puts    ("                                      (default: text)");
+       puts    ("      --outfile       <file>          destination file");
+       puts    ("                                      (default: stdout)");
+       puts    ("      --formats                       list available formats");
 }
 
+/*
+ * end of CLI
+ */
+
 extern list_item *database;
 
+static void
+quit_mutt_query(int status)
+{
+       close_database();
+       close_config();
+
+       exit(status);
+}
+
 static void
 muttq_print_item(FILE *file, int item)
 {
@@ -273,15 +413,6 @@ init_mutt_query()
        }
 }
 
-static void
-quit_mutt_query(int status)
-{
-       close_database();
-       close_config();
-
-       exit(status);
-}
-
 
 static char *
 make_mailstr(int item)
@@ -440,11 +571,8 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
                fprintf(stderr, "try --help\n");
        }
 
-       strlower(srcformat);
-       strlower(dstformat);
-
 #ifndef DEBUG
-       if( !strcmp(srcformat, dstformat) ) {
+       if( !strcasecmp(srcformat, dstformat) ) {
                printf( "input and output formats are the same\n"
                        "exiting...\n");
                exit(1);
@@ -454,7 +582,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
        set_filenames();
        init_options();
 
-       switch( import(srcformat, srcfile) ) {
+       switch( import_file(srcformat, srcfile) ) {
                case -1:
                        fprintf(stderr,
                                "input format %s not supported\n", srcformat);
@@ -467,7 +595,7 @@ convert(char *srcformat, char *srcfile, char *dstformat, char *dstfile)
        }
 
        if(!ret)
-               switch( export(dstformat, dstfile) ) {
+               switch( export_file(dstformat, dstfile) ) {
                        case -1:
                                fprintf(stderr,
                                        "output format %s not supported\n",
diff --git a/conff.c b/conff.c
index 7614fc295a44d60f15a37c9e6f7f08fc2398d987..80e9c5fb61b4ebcabef92e608f5ce8656d0c1c50 100644 (file)
--- a/conff.c
+++ b/conff.c
@@ -76,7 +76,8 @@ conff_add_key(struct conff_node **ptr, char *key, char *value, int flags)
                                return 1;
                }
        
-       if( (new_item = malloc(sizeof(struct conff_node))) == NULL )
+       if( (new_item = (struct conff_node *)malloc(sizeof(struct conff_node)))
+                       == NULL )
                return 5;
 
        if(replace) { 
index b2f90b67121180191e1119e409e86b791d6657a6..2027320d579f66003b180e9c4f7809bb5d15d3ce 100755 (executable)
--- a/configure
+++ b/configure
@@ -695,7 +695,7 @@ fi
 
 PACKAGE=abook
 
-VERSION=0.4.16-cvs
+VERSION=2002-xx-xx
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
index 0591642939b1222a6856272b84812a40560ce6e9..0ad64bc510ea9ba3e84660488ee22e3d2e0d6c8c 100644 (file)
@@ -1,7 +1,7 @@
 dnl abook configure.in
 
 AC_INIT(abook.c)
-AM_INIT_AUTOMAKE(abook, 0.4.16-cvs)
+AM_INIT_AUTOMAKE(abook, 2002-xx-xx)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST
index f1ebdf7d47f368bbe1b0282b7c04c90bd12a1a0f..2a5ce8be107f8479ec7e07784259f51cf008c35b 100644 (file)
@@ -242,7 +242,7 @@ validate_item(list_item item)
                item[EMAIL] = strdup("");
 
        for(i=0; i<ITEM_FIELDS; i++)
-               if( item[i] && (strlen(item[i]) > _MAX_FIELD_LEN(i) ) ) {
+               if( item[i] && ((int)strlen(item[i]) > _MAX_FIELD_LEN(i) ) ) {
                        tmp = item[i];
                        item[i][_MAX_FIELD_LEN(i)-1] = 0;
                        item[i] = strdup(item[i]);
@@ -263,9 +263,9 @@ adjust_list_capacity()
        else
                return;
 
-       database = abook_realloc(database,
+       database = (list_item *)abook_realloc(database,
                        sizeof(list_item) * list_capacity);
-       selected = abook_realloc(selected, list_capacity);
+       selected = (char *)abook_realloc(selected, list_capacity);
 }
 
 int
@@ -471,10 +471,10 @@ out:
 struct db_enumerator
 init_db_enumerator(int mode)
 {
-       struct db_enumerator new;
+       struct db_enumerator e;
 
-       new.item = -1; /* important - means "start from beginning" */
-       new.mode = mode;
+       e.item = -1; /* important - means "start from beginning" */
+       e.mode = mode;
 
-       return new;
+       return e;
 }
diff --git a/edit.c b/edit.c
index 9cfbf26bab89737706b785ccd0a4d090d40fd18b..b2e75084f0c4fb4d258d9f2567eef150cf32032e 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -342,7 +342,7 @@ edit_undo(int item, int mode)
                                free_list_item(backup[0]);
                                my_free(backup);
                        }
-                       backup = abook_malloc(sizeof(list_item));
+                       backup = (list_item *)abook_malloc(sizeof(list_item));
                        for(i = 0; i < ITEM_FIELDS; i++)
                                backup[0][i] = safe_strdup(database[item][i]);
                        break;
diff --git a/estr.c b/estr.c
index 93c2290d94c3ebd21d038386c485ff06bcd10832..3f2d25e9b766c07bab0b5c07da95672567f2363b 100644 (file)
--- a/estr.c
+++ b/estr.c
@@ -78,7 +78,7 @@ wenter_string(WINDOW *win, const int maxlen, const int flags)
        int size = maxlen > 0 ? maxlen + 1 : INITIAL_BUFSIZE; 
 
        getyx(win, y, x);
-       str = MALLOC(size);
+       str = (char *)MALLOC(size);
 
        for( ;; ) { /* main loop */
                if(flags & ESTR_DONT_WRAP && x+i > COLS-2) {
@@ -122,7 +122,7 @@ wenter_string(WINDOW *win, const int maxlen, const int flags)
                str[i++] = ch;
                waddch(win,ch);
                if( i + 1 >= size )
-                       str = REALLOC( str, size *= 2 );
+                       str = (char *)REALLOC( str, size *= 2 );
        }
 out:
        if( i >= 0 && str != NULL )
@@ -258,7 +258,8 @@ filesel_add_filesel_list_item(struct filesel_list_item item)
        if( ++filesel_items > filesel_list_capacity) {
                filesel_list_capacity =
                filesel_list_capacity < 1 ? 30:filesel_list_capacity << 1;
-               lst = REALLOC(lst, filesel_list_capacity *
+               lst = (struct filesel_list_item *)REALLOC(lst,
+                       filesel_list_capacity *
                        sizeof(struct filesel_list_item) );
        }
 
@@ -519,7 +520,8 @@ filesel_enter()
 
        if(lst[filesel_curitem].type == FLSL_TYPE_DIR) {
                dir = my_getcwd();
-               newdir = MALLOC(strlen(dir)+strlen(lst[filesel_curitem].filename) +2 );
+               newdir = (char *)MALLOC(strlen(dir) + 
+                               strlen(lst[filesel_curitem].filename) +2 );
                strcpy(newdir, dir);
                strcat(newdir, "/");
                strcat(newdir,lst[filesel_curitem].filename);
@@ -595,7 +597,8 @@ filesel()
 
        if( !filesel_loop() ) {
                dir = my_getcwd();
-               tmp = MALLOC(strlen(dir) + strlen(lst[filesel_curitem].filename) + 2);
+               tmp = (char *)MALLOC(strlen(dir) +
+                               strlen(lst[filesel_curitem].filename) + 2);
                strcpy(tmp,dir);
                strcat(tmp, "/");
                strcat(tmp, lst[filesel_curitem].filename);
index b4893983dfb40015bebf23c019c2d166dc653053..ad80f45ca61ab0e28b031368ebe46322f28b33ce 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -230,14 +230,15 @@ i_read_file(char *filename, int (*func) (FILE *in))
 }
 
 int
-import(char filtname[FILTNAME_LEN], char *filename)
+import_file(char filtname[FILTNAME_LEN], char *filename)
 {
        int i;
        int tmp = items;
        int ret = 0;
 
        for(i=0;; i++) {
-               if( ! strncmp(i_filters[i].filtname, filtname, FILTNAME_LEN) )
+               if( ! strncasecmp(i_filters[i].filtname, filtname,
+                                       FILTNAME_LEN) )
                        break;
                if( ! *i_filters[i].filtname ) {
                        i = -1;
@@ -299,7 +300,7 @@ export_database()
        
        filter = getch() - 'a';
        if(filter == 'x' - 'a' ||
-               filter >= number_of_output_filters(e_filters) || filter < 0) {
+               filter >= number_of_output_filters() || filter < 0) {
                refresh_screen();
                return 1;
        }
@@ -362,7 +363,8 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle, int enum_mode)
        struct db_enumerator e = init_db_enumerator(enum_mode);
 
        for(i=0;; i++) {
-               if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
+               if( ! strncasecmp(e_filters[i].filtname, filtname,
+                                       FILTNAME_LEN) )
                        break;
                if( ! *e_filters[i].filtname ) {
                        i = -1;
@@ -376,7 +378,7 @@ fexport(char filtname[FILTNAME_LEN], FILE *handle, int enum_mode)
        
 
 int
-export(char filtname[FILTNAME_LEN], char *filename)
+export_file(char filtname[FILTNAME_LEN], char *filename)
 {
        const int mode = ENUM_ALL;
        int i;
@@ -384,7 +386,8 @@ export(char filtname[FILTNAME_LEN], char *filename)
        struct db_enumerator e = init_db_enumerator(mode);
        
        for(i=0;; i++) {
-               if( ! strncmp(e_filters[i].filtname, filtname, FILTNAME_LEN) )
+               if( ! strncasecmp(e_filters[i].filtname, filtname,
+                                       FILTNAME_LEN) )
                        break;
                if( ! *e_filters[i].filtname ) {
                        i = -1;
@@ -587,7 +590,7 @@ ldif_fix_string(char *str)
 {
        int i, j;
 
-       for( i = 0, j = 0; j < strlen(str); i++, j++)
+       for( i = 0, j = 0; j < (int)strlen(str); i++, j++)
                str[i] = ( str[j] == (char)0xc3 ?
                                (char) str[++j] + (char) 0x40 :
                                str[j] );
@@ -852,7 +855,7 @@ pine_fixbuf(char *buf)
 {
        int i,j;
 
-       for(i=0,j=0; j < strlen(buf); i++, j++)
+       for(i=0,j=0; j < (int)strlen(buf); i++, j++)
                buf[i] = buf[j] == '\n' ? buf[++j] : buf[j];
 }
 
@@ -898,7 +901,7 @@ pine_parse_buf(char *buf)
                len = last ? strlen(start) : (int) (end-start);
                len = min(len, 400-1);
        
-               if(i < sizeof(pine_conv_table) / sizeof(*pine_conv_table)
+               if(i < (int)(sizeof(pine_conv_table) / sizeof(*pine_conv_table))
                                && pine_conv_table[i] >= 0) {
                        strncpy(tmp, start, len);
                        tmp[len] = 0;
@@ -1060,9 +1063,11 @@ csv_store_field(list_item item, char *s, int field)
        if( !(newstr = csv_remove_quotes(s)) )
                return;
 
-       if(field < (sizeof(csv_conv_table) / sizeof(*csv_conv_table))
+       if(field < (int)(sizeof(csv_conv_table) / sizeof(*csv_conv_table))
                        && csv_conv_table[field] >= 0) {
                item[csv_conv_table[field]] = newstr;
+       } else {
+               my_free(newstr);
        }
 }
 
index a1ee168c6a7f0877c653284f4b2a7715a4686753..d5fb1d2968cd7a50f0dd85214e5e9813eb6a87db 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -3,7 +3,7 @@
 
 #include "database.h"
 
-#define                FILTNAME_LEN    6
+#define                FILTNAME_LEN    7
 
 
 struct abook_output_filter {
@@ -20,10 +20,10 @@ struct abook_input_filter {
 
 
 int            import_database();
-int             import(char filtname[FILTNAME_LEN], char *filename);
+int             import_file(char filtname[FILTNAME_LEN], char *filename);
 
 int            export_database();
-int             export(char filtname[FILTNAME_LEN], char *filename);
+int             export_file(char filtname[FILTNAME_LEN], char *filename);
 int            fexport(char filtname[FILTNAME_LEN], FILE *handle,
                int enum_mode);
 
diff --git a/getopt.c b/getopt.c
new file mode 100644 (file)
index 0000000..0f41fb6
--- /dev/null
+++ b/getopt.c
@@ -0,0 +1,1004 @@
+/* Getopt for GNU.
+   NOTE: getopt is now part of the C library, so if you don't know what
+   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
+   before changing it!
+
+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
+   Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.  Its master source is NOT part of
+   the C library, however.  The master source lives in /gd/gnu/lib.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+\f
+/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
+   Ditto for AIX 3.2 and <stdlib.h>.  */
+#ifndef _NO_PROTO
+#define _NO_PROTO
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#if !defined (__STDC__) || !__STDC__
+/* This is a separate conditional since some stdc systems
+   reject `defined (const)'.  */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef __GNU_LIBRARY__
+/* Don't include stdlib.h for non-GNU C libraries because some of them
+   contain conflicting prototypes for getopt.  */
+#include <stdlib.h>
+#include <unistd.h>
+#endif /* GNU C library.  */
+
+#ifdef VMS
+#include <unixlib.h>
+#if HAVE_STRING_H - 0
+#include <string.h>
+#endif
+#endif
+
+#if defined (WIN32) && !defined (__CYGWIN32__)
+/* It's not Unix, really.  See?  Capital letters.  */
+#include <windows.h>
+#define getpid() GetCurrentProcessId()
+#endif
+
+#ifndef _
+/* This is for other GNU distributions with internationalized messages.
+   When compiling libc, the _ macro is predefined.  */
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#define _(msgid)       gettext (msgid)
+#else
+#define _(msgid)       (msgid)
+#endif
+#endif
+
+/* This version of `getopt' appears to the caller like standard Unix `getopt'
+   but it behaves differently for the user, since it allows the user
+   to intersperse the options with the other arguments.
+
+   As `getopt' works, it permutes the elements of ARGV so that,
+   when it is done, all the options precede everything else.  Thus
+   all application programs are extended to handle flexible argument order.
+
+   Setting the environment variable POSIXLY_CORRECT disables permutation.
+   Then the behavior is completely standard.
+
+   GNU application programs can use a third alternative mode in which
+   they can distinguish the relative order of options and other arguments.  */
+
+#include "getopt.h"
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+char *optarg = NULL;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+/* 1003.2 says this must be 1 before any call.  */
+int optind = 1;
+
+/* Formerly, initialization of getopt depended on optind==0, which
+   causes problems with re-calling getopt as programs generally don't
+   know that. */
+
+int __getopt_initialized = 0;
+
+/* The next char to be scanned in the option-element
+   in which the last option character we returned was found.
+   This allows us to pick up the scan where we left off.
+
+   If this is zero, or a null string, it means resume the scan
+   by advancing to the next ARGV-element.  */
+
+static char *nextchar;
+
+/* Callers store zero here to inhibit the error message
+   for unrecognized options.  */
+
+int opterr = 1;
+
+/* Set to an option character which was unrecognized.
+   This must be initialized on some systems to avoid linking in the
+   system's own getopt implementation.  */
+
+int optopt = '?';
+
+/* Describe how to deal with options that follow non-option ARGV-elements.
+
+   If the caller did not specify anything,
+   the default is REQUIRE_ORDER if the environment variable
+   POSIXLY_CORRECT is defined, PERMUTE otherwise.
+
+   REQUIRE_ORDER means don't recognize them as options;
+   stop option processing when the first non-option is seen.
+   This is what Unix does.
+   This mode of operation is selected by either setting the environment
+   variable POSIXLY_CORRECT, or using `+' as the first character
+   of the list of option characters.
+
+   PERMUTE is the default.  We permute the contents of ARGV as we scan,
+   so that eventually all the non-options are at the end.  This allows options
+   to be given in any order, even with programs that were not written to
+   expect this.
+
+   RETURN_IN_ORDER is an option available to programs that were written
+   to expect options and other ARGV-elements in any order and that care about
+   the ordering of the two.  We describe each non-option ARGV-element
+   as if it were the argument of an option with character code 1.
+   Using `-' as the first character of the list of option characters
+   selects this mode of operation.
+
+   The special argument `--' forces an end of option-scanning regardless
+   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
+   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+
+static enum
+{
+       REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
+}
+ordering;
+
+/* Value of POSIXLY_CORRECT environment variable.  */
+static char *posixly_correct;
+\f
+#ifdef __GNU_LIBRARY__
+/* We want to avoid inclusion of string.h with non-GNU libraries
+   because there are many ways it can cause trouble.
+   On some systems, it contains special magic macros that don't work
+   in GCC.  */
+#include <string.h>
+#define        my_index        strchr
+#else
+
+/* Avoid depending on library functions or files
+   whose names are inconsistent.  */
+
+char *getenv();
+
+static char *
+     my_index(str, chr)
+     const char *str;
+     int chr;
+{
+       while (*str)
+       {
+               if (*str == chr)
+                       return (char *) str;
+               str++;
+       }
+       return 0;
+}
+
+/* If using GCC, we can safely declare strlen this way.
+   If not using GCC, it is ok not to declare it.  */
+#ifdef __GNUC__
+/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
+   That was relevant to code that was here before.  */
+#if !defined (__STDC__) || !__STDC__
+/* gcc with -traditional declares the built-in strlen to return int,
+   and has done so at least since version 2.4.5. -- rms.  */
+extern int strlen(const char *);
+
+#endif /* not __STDC__ */
+#endif /* __GNUC__ */
+
+#endif /* not __GNU_LIBRARY__ */
+\f
+/* Handle permutation of arguments.  */
+
+/* Describe the part of ARGV that contains non-options that have
+   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
+   `last_nonopt' is the index after the last of them.  */
+
+static int first_nonopt;
+static int last_nonopt;
+
+#ifdef _LIBC
+/* Bash 2.0 gives us an environment variable containing flags
+   indicating ARGV elements that should not be considered arguments.  */
+
+static const char *nonoption_flags;
+static int nonoption_flags_len;
+
+static int original_argc;
+static char *const *original_argv;
+
+/* Make sure the environment variable bash 2.0 puts in the environment
+   is valid for the getopt call we must make sure that the ARGV passed
+   to getopt is that one passed to the process.  */
+static void store_args(int argc, char *const *argv) __attribute__((unused));
+     static void
+          store_args(int argc, char *const *argv)
+{
+       /* XXX This is no good solution.  We should rather copy the args so
+          that we can compare them later.  But we must not use malloc(3).  */
+       original_argc = argc;
+       original_argv = argv;
+}
+text_set_element(__libc_subinit, store_args);
+#endif
+
+/* Exchange two adjacent subsequences of ARGV.
+   One subsequence is elements [first_nonopt,last_nonopt)
+   which contains all the non-options that have been skipped so far.
+   The other is elements [last_nonopt,optind), which contains all
+   the options processed since those non-options were skipped.
+
+   `first_nonopt' and `last_nonopt' are relocated so that they describe
+   the new indices of the non-options in ARGV after they are moved.  */
+
+#if defined (__STDC__) && __STDC__
+static void exchange(char **);
+
+#endif
+
+static void
+     exchange(argv)
+     char **argv;
+{
+       int bottom = first_nonopt;
+       int middle = last_nonopt;
+       int top = optind;
+       char *tem;
+
+       /* Exchange the shorter segment with the far end of the longer segment.
+          That puts the shorter segment into the right place.
+          It leaves the longer segment in the right place overall,
+          but it consists of two parts that need to be swapped next.  */
+
+       while (top > middle && middle > bottom)
+       {
+               if (top - middle > middle - bottom)
+               {
+                       /* Bottom segment is the short one.  */
+                       int len = middle - bottom;
+                       register int i;
+
+                       /* Swap it with the top part of the top segment.  */
+                       for (i = 0; i < len; i++)
+                       {
+                               tem = argv[bottom + i];
+                               argv[bottom + i] = argv[top - (middle - bottom) + i];
+                               argv[top - (middle - bottom) + i] = tem;
+                       }
+                       /* Exclude the moved bottom segment from further swapping.  */
+                       top -= len;
+               }
+               else
+               {
+                       /* Top segment is the short one.  */
+                       int len = top - middle;
+                       register int i;
+
+                       /* Swap it with the bottom part of the bottom segment.  */
+                       for (i = 0; i < len; i++)
+                       {
+                               tem = argv[bottom + i];
+                               argv[bottom + i] = argv[middle + i];
+                               argv[middle + i] = tem;
+                       }
+                       /* Exclude the moved top segment from further swapping.  */
+                       bottom += len;
+               }
+       }
+
+       /* Update records for the slots the non-options now occupy.  */
+
+       first_nonopt += (optind - last_nonopt);
+       last_nonopt = optind;
+}
+
+/* Initialize the internal data when the first call is made.  */
+
+#if defined (__STDC__) && __STDC__
+static const char *_getopt_initialize(int, char *const *, const char *);
+
+#endif
+static const char *
+     _getopt_initialize(argc, argv, optstring)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+{
+       /* Start processing options with ARGV-element 1 (since ARGV-element 0
+          is the program name); the sequence of previously skipped
+          non-option ARGV-elements is empty.  */
+
+       first_nonopt = last_nonopt = optind = 1;
+
+       nextchar = NULL;
+
+       posixly_correct = getenv("POSIXLY_CORRECT");
+
+       /* Determine how to handle the ordering of options and nonoptions.  */
+
+       if (optstring[0] == '-')
+       {
+               ordering = RETURN_IN_ORDER;
+               ++optstring;
+       }
+       else if (optstring[0] == '+')
+       {
+               ordering = REQUIRE_ORDER;
+               ++optstring;
+       }
+       else if (posixly_correct != NULL)
+               ordering = REQUIRE_ORDER;
+       else
+               ordering = PERMUTE;
+
+#ifdef _LIBC
+       if (posixly_correct == NULL
+           && argc == original_argc && argv == original_argv)
+       {
+               /* Bash 2.0 puts a special variable in the environment for each
+                  command it runs, specifying which ARGV elements are the results of
+                  file name wildcard expansion and therefore should not be
+                  considered as options.  */
+               char var[100];
+
+               sprintf(var, "_%d_GNU_nonoption_argv_flags_", getpid());
+               nonoption_flags = getenv(var);
+               if (nonoption_flags == NULL)
+                       nonoption_flags_len = 0;
+               else
+                       nonoption_flags_len = strlen(nonoption_flags);
+       }
+       else
+               nonoption_flags_len = 0;
+#endif
+
+       return optstring;
+}
+\f
+/* Scan elements of ARGV (whose length is ARGC) for option characters
+   given in OPTSTRING.
+
+   If an element of ARGV starts with '-', and is not exactly "-" or "--",
+   then it is an option element.  The characters of this element
+   (aside from the initial '-') are option characters.  If `getopt'
+   is called repeatedly, it returns successively each of the option characters
+   from each of the option elements.
+
+   If `getopt' finds another option character, it returns that character,
+   updating `optind' and `nextchar' so that the next call to `getopt' can
+   resume the scan with the following option character or ARGV-element.
+
+   If there are no more option characters, `getopt' returns -1.
+   Then `optind' is the index in ARGV of the first ARGV-element
+   that is not an option.  (The ARGV-elements have been permuted
+   so that those that are not options now come last.)
+
+   OPTSTRING is a string containing the legitimate option characters.
+   If an option character is seen that is not listed in OPTSTRING,
+   return '?' after printing an error message.  If you set `opterr' to
+   zero, the error message is suppressed but we still return '?'.
+
+   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
+   so the following text in the same ARGV-element, or the text of the following
+   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   wants an optional arg; if there is text in the current ARGV-element,
+   it is returned in `optarg', otherwise `optarg' is set to zero.
+
+   If OPTSTRING starts with `-' or `+', it requests different methods of
+   handling the non-option ARGV-elements.
+   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
+
+   Long-named options begin with `--' instead of `-'.
+   Their names may be abbreviated as long as the abbreviation is unique
+   or is an exact match for some defined option.  If they have an
+   argument, it follows the option name in the same ARGV-element, separated
+   from the option name by a `=', or else the in next ARGV-element.
+   When `getopt' finds a long-named option, it returns 0 if that option's
+   `flag' field is nonzero, the value of the option's `val' field
+   if the `flag' field is zero.
+
+   The elements of ARGV aren't really const, because we permute them.
+   But we pretend they're const in the prototype to be compatible
+   with other systems.
+
+   LONGOPTS is a vector of `struct option' terminated by an
+   element containing a name which is zero.
+
+   LONGIND returns the index in LONGOPT of the long-named option found.
+   It is only valid when a long-named option has been found by the most
+   recent call.
+
+   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
+   long-named options.  */
+
+int
+    _getopt_internal(argc, argv, optstring, longopts, longind, long_only)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+     const struct option *longopts;
+     int *longind;
+     int long_only;
+{
+       optarg = NULL;
+
+       if (!__getopt_initialized || optind == 0)
+       {
+               optstring = _getopt_initialize(argc, argv, optstring);
+               optind = 1;     /* Don't scan ARGV[0], the program name.  */
+               __getopt_initialized = 1;
+       }
+
+       /* Test whether ARGV[optind] points to a non-option argument.
+          Either it does not have option syntax, or there is an environment flag
+          from the shell indicating it is not an option.  The later information
+          is only used when the used in the GNU libc.  */
+#ifdef _LIBC
+#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0'       \
+                    || (optind < nonoption_flags_len                         \
+                        && nonoption_flags[optind] == '1'))
+#else
+#define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0')
+#endif
+
+       if (nextchar == NULL || *nextchar == '\0')
+       {
+               /* Advance to the next ARGV-element.  */
+
+               /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
+                  moved back by the user (who may also have changed the arguments).  */
+               if (last_nonopt > optind)
+                       last_nonopt = optind;
+               if (first_nonopt > optind)
+                       first_nonopt = optind;
+
+               if (ordering == PERMUTE)
+               {
+                       /* If we have just processed some options following some non-options,
+                          exchange them so that the options come first.  */
+
+                       if (first_nonopt != last_nonopt && last_nonopt != optind)
+                               exchange((char **) argv);
+                       else if (last_nonopt != optind)
+                               first_nonopt = optind;
+
+                       /* Skip any additional non-options
+                          and extend the range of non-options previously skipped.  */
+
+                       while (optind < argc && NONOPTION_P)
+                               optind++;
+                       last_nonopt = optind;
+               }
+
+               /* The special ARGV-element `--' means premature end of options.
+                  Skip it like a null option,
+                  then exchange with previous non-options as if it were an option,
+                  then skip everything else like a non-option.  */
+
+               if (optind != argc && !strcmp(argv[optind], "--"))
+               {
+                       optind++;
+
+                       if (first_nonopt != last_nonopt && last_nonopt != optind)
+                               exchange((char **) argv);
+                       else if (first_nonopt == last_nonopt)
+                               first_nonopt = optind;
+                       last_nonopt = argc;
+
+                       optind = argc;
+               }
+
+               /* If we have done all the ARGV-elements, stop the scan
+                  and back over any non-options that we skipped and permuted.  */
+
+               if (optind == argc)
+               {
+                       /* Set the next-arg-index to point at the non-options
+                          that we previously skipped, so the caller will digest them.  */
+                       if (first_nonopt != last_nonopt)
+                               optind = first_nonopt;
+                       return -1;
+               }
+
+               /* If we have come to a non-option and did not permute it,
+                  either stop the scan or describe it to the caller and pass it by.  */
+
+               if (NONOPTION_P)
+               {
+                       if (ordering == REQUIRE_ORDER)
+                               return -1;
+                       optarg = argv[optind++];
+                       return 1;
+               }
+
+               /* We have found another option-ARGV-element.
+                  Skip the initial punctuation.  */
+
+               nextchar = (argv[optind] + 1
+                           + (longopts != NULL && argv[optind][1] == '-'));
+       }
+
+       /* Decode the current option-ARGV-element.  */
+
+       /* Check whether the ARGV-element is a long option.
+
+          If long_only and the ARGV-element has the form "-f", where f is
+          a valid short option, don't consider it an abbreviated form of
+          a long option that starts with f.  Otherwise there would be no
+          way to give the -f short option.
+
+          On the other hand, if there's a long option "fubar" and
+          the ARGV-element is "-fu", do consider that an abbreviation of
+          the long option, just like "--fu", and not "-f" with arg "u".
+
+          This distinction seems to be the most useful approach.  */
+
+       if (longopts != NULL
+           && (argv[optind][1] == '-'
+               || (long_only && (argv[optind][2] || !my_index(optstring, argv[optind][1])))))
+       {
+               char *nameend;
+               const struct option *p;
+               const struct option *pfound = NULL;
+               int exact = 0;
+               int ambig = 0;
+               int indfound = -1;
+               int option_index;
+
+               for (nameend = nextchar; *nameend && *nameend != '='; nameend++)
+                       /* Do nothing.  */ ;
+
+               /* Test all long options for either exact match
+                  or abbreviated matches.  */
+               for (p = longopts, option_index = 0; p->name; p++, option_index++)
+                       if (!strncmp(p->name, nextchar, nameend - nextchar))
+                       {
+                               if ((unsigned int) (nameend - nextchar)
+                                   == (unsigned int) strlen(p->name))
+                               {
+                                       /* Exact match found.  */
+                                       pfound = p;
+                                       indfound = option_index;
+                                       exact = 1;
+                                       break;
+                               }
+                               else if (pfound == NULL)
+                               {
+                                       /* First nonexact match found.  */
+                                       pfound = p;
+                                       indfound = option_index;
+                               }
+                               else
+                                       /* Second or later nonexact match found.  */
+                                       ambig = 1;
+                       }
+
+               if (ambig && !exact)
+               {
+                       if (opterr)
+                               fprintf(stderr, _("%s: option `%s' is ambiguous\n"),
+                                       argv[0], argv[optind]);
+                       nextchar += strlen(nextchar);
+                       optind++;
+                       optopt = 0;
+                       return '?';
+               }
+
+               if (pfound != NULL)
+               {
+                       option_index = indfound;
+                       optind++;
+                       if (*nameend)
+                       {
+                               /* Don't test has_arg with >, because some C compilers don't
+                                  allow it to be used on enums.  */
+                               if (pfound->has_arg)
+                                       optarg = nameend + 1;
+                               else
+                               {
+                                       if (opterr)
+                                               if (argv[optind - 1][1] == '-')
+                                                       /* --option */
+                                                       fprintf(stderr,
+                                                               _("%s: option `--%s' doesn't allow an argument\n"),
+                                                               argv[0], pfound->name);
+                                               else
+                                                       /* +option or -option */
+                                                       fprintf(stderr,
+                                                               _("%s: option `%c%s' doesn't allow an argument\n"),
+                                                               argv[0], argv[optind - 1][0], pfound->name);
+
+                                       nextchar += strlen(nextchar);
+
+                                       optopt = pfound->val;
+                                       return '?';
+                               }
+                       }
+                       else if (pfound->has_arg == 1)
+                       {
+                               if (optind < argc)
+                                       optarg = argv[optind++];
+                               else
+                               {
+                                       if (opterr)
+                                               fprintf(stderr,
+                                                       _("%s: option `%s' requires an argument\n"),
+                                                argv[0], argv[optind - 1]);
+                                       nextchar += strlen(nextchar);
+                                       optopt = pfound->val;
+                                       return optstring[0] == ':' ? ':' : '?';
+                               }
+                       }
+                       nextchar += strlen(nextchar);
+                       if (longind != NULL)
+                               *longind = option_index;
+                       if (pfound->flag)
+                       {
+                               *(pfound->flag) = pfound->val;
+                               return 0;
+                       }
+                       return pfound->val;
+               }
+
+               /* Can't find it as a long option.  If this is not getopt_long_only,
+                  or the option starts with '--' or is not a valid short
+                  option, then it's an error.
+                  Otherwise interpret it as a short option.  */
+               if (!long_only || argv[optind][1] == '-'
+                   || my_index(optstring, *nextchar) == NULL)
+               {
+                       if (opterr)
+                       {
+                               if (argv[optind][1] == '-')
+                                       /* --option */
+                                       fprintf(stderr, _("%s: unrecognized option `--%s'\n"),
+                                               argv[0], nextchar);
+                               else
+                                       /* +option or -option */
+                                       fprintf(stderr, _("%s: unrecognized option `%c%s'\n"),
+                                       argv[0], argv[optind][0], nextchar);
+                       }
+                       nextchar = (char *) "";
+                       optind++;
+                       optopt = 0;
+                       return '?';
+               }
+       }
+
+       /* Look at and handle the next short option-character.  */
+
+       {
+               char c = *nextchar++;
+               char *temp = my_index(optstring, c);
+
+               /* Increment `optind' when we start to process its last character.  */
+               if (*nextchar == '\0')
+                       ++optind;
+
+               if (temp == NULL || c == ':')
+               {
+                       if (opterr)
+                       {
+                               if (posixly_correct)
+                                       /* 1003.2 specifies the format of this message.  */
+                                       fprintf(stderr, _("%s: illegal option -- %c\n"),
+                                               argv[0], c);
+                               else
+                                       fprintf(stderr, _("%s: invalid option -- %c\n"),
+                                               argv[0], c);
+                       }
+                       optopt = c;
+                       return '?';
+               }
+               /* Convenience. Treat POSIX -W foo same as long option --foo */
+               if (temp[0] == 'W' && temp[1] == ';')
+               {
+                       char *nameend;
+                       const struct option *p;
+                       const struct option *pfound = NULL;
+                       int exact = 0;
+                       int ambig = 0;
+                       int indfound = 0;
+                       int option_index;
+
+                       /* This is an option that requires an argument.  */
+                       if (*nextchar != '\0')
+                       {
+                               optarg = nextchar;
+                               /* If we end this ARGV-element by taking the rest as an arg,
+                                  we must advance to the next element now.  */
+                               optind++;
+                       }
+                       else if (optind == argc)
+                       {
+                               if (opterr)
+                               {
+                                       /* 1003.2 specifies the format of this message.  */
+                                       fprintf(stderr, _("%s: option requires an argument -- %c\n"),
+                                               argv[0], c);
+                               }
+                               optopt = c;
+                               if (optstring[0] == ':')
+                                       c = ':';
+                               else
+                                       c = '?';
+                               return c;
+                       }
+                       else
+                               /* We already incremented `optind' once;
+                                  increment it again when taking next ARGV-elt as argument.  */
+                               optarg = argv[optind++];
+
+                       /* optarg is now the argument, see if it's in the
+                          table of longopts.  */
+
+                       for (nextchar = nameend = optarg; *nameend && *nameend != '='; nameend++)
+                               /* Do nothing.  */ ;
+
+                       /* Test all long options for either exact match
+                          or abbreviated matches.  */
+                       for (p = longopts, option_index = 0; p->name; p++, option_index++)
+                               if (!strncmp(p->name, nextchar, nameend - nextchar))
+                               {
+                                       if ((unsigned int) (nameend - nextchar) == strlen(p->name))
+                                       {
+                                               /* Exact match found.  */
+                                               pfound = p;
+                                               indfound = option_index;
+                                               exact = 1;
+                                               break;
+                                       }
+                                       else if (pfound == NULL)
+                                       {
+                                               /* First nonexact match found.  */
+                                               pfound = p;
+                                               indfound = option_index;
+                                       }
+                                       else
+                                               /* Second or later nonexact match found.  */
+                                               ambig = 1;
+                               }
+                       if (ambig && !exact)
+                       {
+                               if (opterr)
+                                       fprintf(stderr, _("%s: option `-W %s' is ambiguous\n"),
+                                               argv[0], argv[optind]);
+                               nextchar += strlen(nextchar);
+                               optind++;
+                               return '?';
+                       }
+                       if (pfound != NULL)
+                       {
+                               option_index = indfound;
+                               if (*nameend)
+                               {
+                                       /* Don't test has_arg with >, because some C compilers don't
+                                          allow it to be used on enums.  */
+                                       if (pfound->has_arg)
+                                               optarg = nameend + 1;
+                                       else
+                                       {
+                                               if (opterr)
+                                                       fprintf(stderr, _("\
+%s: option `-W %s' doesn't allow an argument\n"),
+                                                               argv[0], pfound->name);
+
+                                               nextchar += strlen(nextchar);
+                                               return '?';
+                                       }
+                               }
+                               else if (pfound->has_arg == 1)
+                               {
+                                       if (optind < argc)
+                                               optarg = argv[optind++];
+                                       else
+                                       {
+                                               if (opterr)
+                                                       fprintf(stderr,
+                                                               _("%s: option `%s' requires an argument\n"),
+                                                               argv[0], argv[optind - 1]);
+                                               nextchar += strlen(nextchar);
+                                               return optstring[0] == ':' ? ':' : '?';
+                                       }
+                               }
+                               nextchar += strlen(nextchar);
+                               if (longind != NULL)
+                                       *longind = option_index;
+                               if (pfound->flag)
+                               {
+                                       *(pfound->flag) = pfound->val;
+                                       return 0;
+                               }
+                               return pfound->val;
+                       }
+                       nextchar = NULL;
+                       return 'W';     /* Let the application handle it.   */
+               }
+               if (temp[1] == ':')
+               {
+                       if (temp[2] == ':')
+                       {
+                               /* This is an option that accepts an argument optionally.  */
+                               if (*nextchar != '\0')
+                               {
+                                       optarg = nextchar;
+                                       optind++;
+                               }
+                               else
+                                       optarg = NULL;
+                               nextchar = NULL;
+                       }
+                       else
+                       {
+                               /* This is an option that requires an argument.  */
+                               if (*nextchar != '\0')
+                               {
+                                       optarg = nextchar;
+                                       /* If we end this ARGV-element by taking the rest as an arg,
+                                          we must advance to the next element now.  */
+                                       optind++;
+                               }
+                               else if (optind == argc)
+                               {
+                                       if (opterr)
+                                       {
+                                               /* 1003.2 specifies the format of this message.  */
+                                               fprintf(stderr,
+                                                       _("%s: option requires an argument -- %c\n"),
+                                                       argv[0], c);
+                                       }
+                                       optopt = c;
+                                       if (optstring[0] == ':')
+                                               c = ':';
+                                       else
+                                               c = '?';
+                               }
+                               else
+                                       /* We already incremented `optind' once;
+                                          increment it again when taking next ARGV-elt as argument.  */
+                                       optarg = argv[optind++];
+                               nextchar = NULL;
+                       }
+               }
+               return c;
+       }
+}
+
+int
+    getopt(argc, argv, optstring)
+     int argc;
+     char *const *argv;
+     const char *optstring;
+{
+       return _getopt_internal(argc, argv, optstring,
+                               (const struct option *) 0,
+                               (int *) 0,
+                               0);
+}
+
+#endif /* Not ELIDE_CODE.  */
+\f
+#ifdef TEST
+
+/* Compile with -DTEST to make an executable for use in testing
+   the above definition of `getopt'.  */
+
+int
+    main(argc, argv)
+     int argc;
+     char **argv;
+{
+       int c;
+       int digit_optind = 0;
+
+       while (1)
+       {
+               int this_option_optind = optind ? optind : 1;
+
+               c = getopt(argc, argv, "abc:d:0123456789");
+               if (c == -1)
+                       break;
+
+               switch (c)
+               {
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                               if (digit_optind != 0 && digit_optind != this_option_optind)
+                                       printf("digits occur in two different argv-elements.\n");
+                               digit_optind = this_option_optind;
+                               printf("option %c\n", c);
+                               break;
+
+                       case 'a':
+                               printf("option a\n");
+                               break;
+
+                       case 'b':
+                               printf("option b\n");
+                               break;
+
+                       case 'c':
+                               printf("option c with value `%s'\n", optarg);
+                               break;
+
+                       case '?':
+                               break;
+
+                       default:
+                               printf("?? getopt returned character code 0%o ??\n", c);
+               }
+       }
+
+       if (optind < argc)
+       {
+               printf("non-option ARGV-elements: ");
+               while (optind < argc)
+                       printf("%s ", argv[optind++]);
+               printf("\n");
+       }
+
+       exit(0);
+}
+
+#endif /* TEST */
diff --git a/getopt.h b/getopt.h
new file mode 100644 (file)
index 0000000..2fa12f7
--- /dev/null
+++ b/getopt.h
@@ -0,0 +1,134 @@
+/* Declarations for getopt.
+   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.  Its master source is NOT part of
+   the C library, however.  The master source lives in /gd/gnu/lib.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _GETOPT_H
+#define _GETOPT_H 1
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/* For communication from `getopt' to the caller.
+   When `getopt' finds an option that takes an argument,
+   the argument value is returned here.
+   Also, when `ordering' is RETURN_IN_ORDER,
+   each non-option ARGV-element is returned here.  */
+
+       extern char *optarg;
+
+/* Index in ARGV of the next element to be scanned.
+   This is used for communication to and from the caller
+   and for communication between successive calls to `getopt'.
+
+   On entry to `getopt', zero means this is the first call; initialize.
+
+   When `getopt' returns -1, this is the index of the first of the
+   non-option elements that the caller should itself scan.
+
+   Otherwise, `optind' communicates from one call to the next
+   how much of ARGV has been scanned so far.  */
+
+       extern int optind;
+
+/* Callers store zero here to inhibit the error message `getopt' prints
+   for unrecognized options.  */
+
+       extern int opterr;
+
+/* Set to an option character which was unrecognized.  */
+
+       extern int optopt;
+
+/* Describe the long-named options requested by the application.
+   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+   of `struct option' terminated by an element containing a name which is
+   zero.
+
+   The field `has_arg' is:
+   no_argument          (or 0) if the option does not take an argument,
+   required_argument    (or 1) if the option requires an argument,
+   optional_argument    (or 2) if the option takes an optional argument.
+
+   If the field `flag' is not NULL, it points to a variable that is set
+   to the value given in the field `val' when the option is found, but
+   left unchanged if the option is not found.
+
+   To have a long-named option do something other than set an `int' to
+   a compiled-in constant, such as set a value from `optarg', set the
+   option's `flag' field to zero and its `val' field to a nonzero
+   value (the equivalent single-letter option character, if there is
+   one).  For long options that have a zero `flag' field, `getopt'
+   returns the contents of the `val' field.  */
+
+       struct option
+       {
+#if defined (__STDC__) && __STDC__
+               const char *name;
+#else
+               char *name;
+#endif
+               /* has_arg can't be an enum because some compilers complain about
+                  type mismatches in all the code that assumes it is an int.  */
+               int has_arg;
+               int *flag;
+               int val;
+       };
+
+/* Names for the values of the `has_arg' field of `struct option'.  */
+
+#define        no_argument             0
+#define required_argument      1
+#define optional_argument      2
+
+#if defined (__STDC__) && __STDC__
+#ifdef __GNU_LIBRARY__
+/* Many other libraries have conflicting prototypes for getopt, with
+   differences in the consts, in stdlib.h.  To avoid compilation
+   errors, only prototype getopt for the GNU C library.  */
+       extern int getopt(int argc, char *const *argv, const char *shortopts);
+#else                          /* not __GNU_LIBRARY__ */
+       extern int getopt();
+#endif                         /* __GNU_LIBRARY__ */
+       extern int getopt_long(int argc, char *const *argv, const char *shortopts,
+                              const struct option *longopts, int *longind);
+       extern int getopt_long_only(int argc, char *const *argv,
+                                   const char *shortopts,
+                              const struct option *longopts, int *longind);
+
+/* Internal only.  Users should not call this directly.  */
+       extern int _getopt_internal(int argc, char *const *argv,
+                                   const char *shortopts,
+                               const struct option *longopts, int *longind,
+                                   int long_only);
+#else                          /* not __STDC__ */
+       extern int getopt();
+       extern int getopt_long();
+       extern int getopt_long_only();
+
+       extern int _getopt_internal();
+#endif                         /* __STDC__ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif                         /* _GETOPT_H */
diff --git a/getopt1.c b/getopt1.c
new file mode 100644 (file)
index 0000000..fe414f3
--- /dev/null
+++ b/getopt1.c
@@ -0,0 +1,187 @@
+/* getopt_long and getopt_long_only entry points for GNU getopt.
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.  Its master source is NOT part of
+   the C library, however.  The master source lives in /gd/gnu/lib.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+\f
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "getopt.h"
+
+#if !defined (__STDC__) || !__STDC__
+/* This is a separate conditional since some stdc systems
+   reject `defined (const)'.  */
+#ifndef const
+#define const
+#endif
+#endif
+
+#include <stdio.h>
+
+/* Comment out all this code if we are using the GNU C Library, and are not
+   actually compiling the library itself.  This code is part of the GNU C
+   Library, but also included in many other GNU distributions.  Compiling
+   and linking in this code is a waste when using the GNU C library
+   (especially if it is a shared library).  Rather than having every GNU
+   program understand `configure --with-gnu-libc' and omit the object files,
+   it is simpler to just do this in the source for each such file.  */
+
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined (_LIBC) && defined (__GLIBC__) && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
+
+#ifndef ELIDE_CODE
+
+/* This needs to come after some library #include
+   to get __GNU_LIBRARY__ defined.  */
+#ifdef __GNU_LIBRARY__
+#include <stdlib.h>
+#endif
+
+#ifndef        NULL
+#define NULL 0
+#endif
+
+int
+    getopt_long(argc, argv, options, long_options, opt_index)
+     int argc;
+     char *const *argv;
+     const char *options;
+     const struct option *long_options;
+     int *opt_index;
+{
+       return _getopt_internal(argc, argv, options, long_options, opt_index, 0);
+}
+
+/* Like getopt_long, but '-' as well as '--' can indicate a long option.
+   If an option that starts with '-' (not '--') doesn't match a long option,
+   but does match a short option, it is parsed as a short option
+   instead.  */
+
+int
+    getopt_long_only(argc, argv, options, long_options, opt_index)
+     int argc;
+     char *const *argv;
+     const char *options;
+     const struct option *long_options;
+     int *opt_index;
+{
+       return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
+}
+
+#endif /* Not ELIDE_CODE.  */
+\f
+#ifdef TEST
+
+#include <stdio.h>
+
+int
+    main(argc, argv)
+     int argc;
+     char **argv;
+{
+       int c;
+       int digit_optind = 0;
+
+       while (1)
+       {
+               int this_option_optind = optind ? optind : 1;
+               int option_index = 0;
+               static struct option long_options[] =
+               {
+                       {"add", 1, 0, 0},
+                       {"append", 0, 0, 0},
+                       {"delete", 1, 0, 0},
+                       {"verbose", 0, 0, 0},
+                       {"create", 0, 0, 0},
+                       {"file", 1, 0, 0},
+                       {0, 0, 0, 0}
+               };
+
+               c = getopt_long(argc, argv, "abc:d:0123456789",
+                               long_options, &option_index);
+               if (c == -1)
+                       break;
+
+               switch (c)
+               {
+                       case 0:
+                               printf("option %s", long_options[option_index].name);
+                               if (optarg)
+                                       printf(" with arg %s", optarg);
+                               printf("\n");
+                               break;
+
+                       case '0':
+                       case '1':
+                       case '2':
+                       case '3':
+                       case '4':
+                       case '5':
+                       case '6':
+                       case '7':
+                       case '8':
+                       case '9':
+                               if (digit_optind != 0 && digit_optind != this_option_optind)
+                                       printf("digits occur in two different argv-elements.\n");
+                               digit_optind = this_option_optind;
+                               printf("option %c\n", c);
+                               break;
+
+                       case 'a':
+                               printf("option a\n");
+                               break;
+
+                       case 'b':
+                               printf("option b\n");
+                               break;
+
+                       case 'c':
+                               printf("option c with value `%s'\n", optarg);
+                               break;
+
+                       case 'd':
+                               printf("option d with value `%s'\n", optarg);
+                               break;
+
+                       case '?':
+                               break;
+
+                       default:
+                               printf("?? getopt returned character code 0%o ??\n", c);
+               }
+       }
+
+       if (optind < argc)
+       {
+               printf("non-option ARGV-elements: ");
+               while (optind < argc)
+                       printf("%s ", argv[optind++]);
+               printf("\n");
+       }
+
+       exit(0);
+}
+
+#endif /* TEST */
diff --git a/misc.c b/misc.c
index 1eadf97b19e4edc9fc43ce76196475df1e3bec69..7bf2f8fc1380f9a6b6c55f2059725c2da0afb6b2 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -220,11 +220,11 @@ my_getcwd()
        char *dir = NULL;
        int size = 100;
 
-       if( (dir = malloc(size)) == NULL)
+       if( (dir = (char *)malloc(size)) == NULL)
                return NULL;
        
        while( getcwd(dir, size) == NULL && errno == ERANGE )
-               if( (dir = realloc(dir, size *=2)) == NULL)
+               if( (dir = (char *)realloc(dir, size *=2)) == NULL)
                        return NULL;
 
        return dir;
@@ -266,7 +266,8 @@ getaline(FILE *f)
                        break;          /* the whole line has been read */
 
                for (inc = size, p = NULL; inc > mininc; inc /= 2)
-                       if ((p = abook_realloc(buf, size + inc)) != NULL)
+                       if ((p = (char *)abook_realloc(buf, size + inc)) !=
+                                       NULL)
                                break;
 
                size += inc;
@@ -282,7 +283,7 @@ getaline(FILE *f)
                buf[--len] = '\0';
 
        if (size - len > mucho) { /* a plenitude of unused memory? */
-               p = abook_realloc(buf, len+1);
+               p = (char *)abook_realloc(buf, len+1);
                if (p != NULL) {
                        buf = p;
                        size = len+1;
index a4ab1008311312e32664c6ebe68834ab6786a9b5..2b0353f60d790c3d8cde7edafaf53da4e9f7bb9b 100644 (file)
--- a/options.c
+++ b/options.c
@@ -83,7 +83,13 @@ init_options()
 void
 close_config()
 {
+       /*
+        * we don't save the configuration file since user can specify
+        * alternative configuration files
+        */
+#if 0
        save_options();
+#endif
 
        conff_free_nodes(abook_config);
 }
@@ -114,6 +120,7 @@ load_options()
        }
 }
 
+#if 0
 void
 save_options()
 {
@@ -122,6 +129,7 @@ save_options()
 
        conff_save_file(abook_config, rcfile);
 }
+#endif
 
 static void
 options_add_key(char *key, char *value)
diff --git a/ui.c b/ui.c
index 9dfdd82d2ca672bd47e513de97844618b113f79a..695577e5d7fcd560b632e38fb73815698eac6ecb 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -392,7 +392,7 @@ display_help(int help)
  * end of help
  */
 
-char *selected;
+extern char *selected;
 extern int curitem;
 
 void