database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Allow contrib/dbase to compile if HAVE_ICONV_H it not defined. This is

Browse Source 
only a partial solution but a step in the right direction.
This commit is contained in:
Bruce Momjian
2001-12-21 04:30:59 +00:00
parent eb36cdd562
commit 3f94ff5400
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/dbase/dbf2pg.c
View File

@ -742,12 +742,14 @@ main(int argc, char **argv)
case 'U': case 'U':
username = (char *) strdup(optarg); username = (char *) strdup(optarg);
break; break;
#ifdef HAVE_ICONV_H
case 'F': case 'F':
charset_from = (char *) strdup(optarg); charset_from = (char *) strdup(optarg);
break; break;
case 'T': case 'T':
charset_to = (char *) strdup(optarg); charset_to = (char *) strdup(optarg);
break; break;
#endif
case ':': case ':':
usage(); usage();
printf("missing argument!\n"); printf("missing argument!\n");
@ -806,8 +808,10 @@ main(int argc, char **argv)
free(username); free(username);
if (password) if (password)
free(password); free(password);
#ifdef HAVE_ICONV_H
if (charset_from) if (charset_from)
iconv_close(iconv_d); iconv_close(iconv_d);
#endif
exit(1); exit(1);
} }
@ -846,8 +850,10 @@ main(int argc, char **argv)
free(username); free(username);
if (password) if (password)
free(password); free(password);
#ifdef HAVE_ICONV_H
if (charset_from) if (charset_from)
iconv_close(iconv_d); iconv_close(iconv_d);
#endif
exit(1); exit(1);
} }
@ -864,8 +870,10 @@ main(int argc, char **argv)
free(username); free(username);
if (password) if (password)
free(password); free(password);
#ifdef HAVE_ICONV_H
if (charset_from) if (charset_from)
iconv_close(iconv_d); iconv_close(iconv_d);
#endif
exit(1); exit(1);
} }
if (del) if (del)
@ -880,8 +888,10 @@ main(int argc, char **argv)
free(username); free(username);
if (password) if (password)
free(password); free(password);
#ifdef HAVE_ICONV_H
if (charset_from) if (charset_from)
iconv_close(iconv_d); iconv_close(iconv_d);
#endif
exit(1); exit(1);
} }
if (verbose > 1) if (verbose > 1)
@ -903,8 +913,10 @@ main(int argc, char **argv)
free(username); free(username);
if (password) if (password)
free(password); free(password);
#ifdef HAVE_ICONV_H
if (charset_from) if (charset_from)
iconv_close(iconv_d); iconv_close(iconv_d);
#endif
exit(1); exit(1);
} }
if (verbose > 1) if (verbose > 1)
@ -933,7 +945,9 @@ main(int argc, char **argv)
free(username); free(username);
if (password) if (password)
free(password); free(password);
#ifdef HAVE_ICONV_H
if (charset_from) if (charset_from)
iconv_close(iconv_d); iconv_close(iconv_d);
#endif
exit(0); exit(0);
} }