postgres.git / summary / log / commit / refs

commit    7f155c3322cb8e40f589be270d2eeebfbddfad23
Author:   Bruce Momjian <bruce@momjian.us>
Date:     Thu Dec 08 18:04:38 2005 +0000
First released in: 8.2.0, 8.1.1

    I recently received the Debian bug report below about missing iconv
    support for the dbf2pg contrib module.
    
    The submitter created a patch which replaces the silent ignoring of -F
    (when iconv support is disabled) with a meaningful warning.
    
    Martin Pitt


 contrib/dbase/dbf2pg.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/dbase/dbf2pg.c b/contrib/dbase/dbf2pg.c
index 7d42798dbe3..50948a6bf28 100644
--- a/contrib/dbase/dbf2pg.c
+++ b/contrib/dbase/dbf2pg.c
@@ -618,10 +618,14 @@ main(int argc, char **argv)
 			case 'U':
 				username = (char *) strdup(optarg);
 				break;
-#ifdef HAVE_ICONV_H
 			case 'F':
+#ifdef HAVE_ICONV_H
 				charset_from = (char *) strdup(optarg);
+#else
+				printf("WARNING: dbf2pg was compiled without iconv support, ignoring -F option\n");
+#endif
 				break;
+#ifdef HAVE_ICONV_H
 			case 'T':
 				charset_to = (char *) strdup(optarg);
 				break;


[parent: 00b013b56eda]