*** dbf2pg.c.cvs	Wed Sep  8 17:16:38 2004
--- dbf2pg.c	Wed Sep  8 17:26:20 2004
***************
*** 57,63 ****
  void		do_inserts(PGconn *, char *, dbhead *);
  int			check_table(PGconn *, char *);
  
! char	   *Escape(char *);
  
  #ifdef HAVE_ICONV_H
  char	   *convert_charset(char *string);
--- 57,63 ----
  void		do_inserts(PGconn *, char *, dbhead *);
  int			check_table(PGconn *, char *);
  
! char	   *Escape_db(char *);
  
  #ifdef HAVE_ICONV_H
  char	   *convert_charset(char *string);
***************
*** 110,116 ****
  
  /* FIXME: should this check for overflow? */
  char *
! Escape(char *string)
  {
  	char	   *foo,
  			   *bar;
--- 110,116 ----
  
  /* FIXME: should this check for overflow? */
  char *
! Escape_db(char *string)
  {
  	char	   *foo,
  			   *bar;
***************
*** 466,472 ****
  				if (charset_from)
  					foo = convert_charset(foo);
  #endif
! 				foo = Escape(foo);
  
  				/* handle the date first - liuk */
  				if (fields[h].db_type == 'D')
--- 466,472 ----
  				if (charset_from)
  					foo = convert_charset(foo);
  #endif
! 				foo = Escape_db(foo);
  
  				/* handle the date first - liuk */
  				if (fields[h].db_type == 'D')