Merge branch 'branch-netatalk-2-1'

[netatalk.git] / bin / misc / netacnv.c

diff --git a/bin/misc/netacnv.c b/bin/misc/netacnv.c
index 6e3107c6b01842a6402adc510e73f7a7694282ea..e42c76b526b36013ace3c53f993ee2be8efb90f9 100644 (file)
--- a/bin/misc/netacnv.c
+++ b/bin/misc/netacnv.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -8,7 +12,7 @@
 
 #define MACCHARSET "MAC_ROMAN"
 
-#define flag(x) x, #x
+#define flag(x) {x, #x}
 
 struct flag_map {
     int flag;
@@ -17,6 +21,7 @@ struct flag_map {
 
 struct flag_map flag_map[] = {
     flag(CONV_ESCAPEHEX),
+    flag(CONV_ALLOW_COLON),
     flag(CONV_UNESCAPEHEX),    
     flag(CONV_ESCAPEDOTS),
     flag(CONV_IGNORE),
@@ -85,7 +90,7 @@ int main(int argc, char **argv)
                                        string, strlen(string),
                                        buffer, MAXPATHLEN,
                                        &flags)) ) {
-        fprintf( stderr, "Conversion error");
+        perror("Conversion error");
         return 1;
     }