Fix uniconv -d option. Merge from branch-2-0

diff --git a/bin/uniconv/uniconv.c b/bin/uniconv/uniconv.c
index f62f33c0920258b54d5b35234d5833cb1718bb17..f75225b9dc92aa9c697392a16c8986383d90abc5 100644 (file)
--- a/bin/uniconv/uniconv.c
+++ b/bin/uniconv/uniconv.c
@@ -459,7 +459,7 @@ int main(int argc, char *argv[])
         setlinebuf(stdout); 
 #endif        
 
-        while ((c = getopt (argc, argv, "f:m:t:c:nvVh")) != -1)
+        while ((c = getopt (argc, argv, "f:m:t:c:dnvVh")) != -1)
         switch (c)
         {
        case 'f':
@@ -472,7 +472,7 @@ int main(int argc, char *argv[])
                mac_charset = strdup(optarg);
                break;
        case 'd':
-               conv_flags &= !CONV_ESCAPEDOTS;
+               conv_flags &= ~CONV_ESCAPEDOTS;
                usedots = 1;
                break;
        case 'n':