[SYSTEM] Apply patch from Debian.

Apply main_argc.diff patch from Debian distribution.
Fix handling of program arguments.

Signed-off-by: Alexey Gladkov <legion@altlinux.org>

diff --git a/src/getunimap.c b/src/getunimap.c
index 3705837..16897fc 100644 (file)
--- a/src/getunimap.c
+++ b/src/getunimap.c
@@ -62,7 +62,7 @@ main(int argc, char **argv){
                }
        }
 
-       if (argc != 1)
+       if (optind < argc)
                usage();
 
        fd = getfd(console);

diff --git a/src/loadunimap.c b/src/loadunimap.c
index 4570e7a..3340adf 100644 (file)
--- a/src/loadunimap.c
+++ b/src/loadunimap.c
@@ -74,18 +74,18 @@ main(int argc, char *argv[]) {
                }
        }
 
-       if (argc > 2 || (argc == 1 && !outfnam))
+       if (argc > optind+1 || (argc == optind && !outfnam))
                usage();
 
        fd = getfd(console);
 
        if (outfnam) {
                saveunicodemap(fd, outfnam);
-               if (argc == 1)
+               if (argc == optind)
                        exit(0);
        }
 
-       if (argc == 2)
+       if (argc == optind+1)
                infnam = argv[optind];
        loadunicodemap(fd, infnam);
        exit(0);