projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Isolated ICU locale out of XML config file. Locale is now the second argument to...
[yaz-moved-to-github.git]
/
util
/
yaziconv.c
diff --git
a/util/yaziconv.c
b/util/yaziconv.c
index
958aa9a
..
72dd075
100644
(file)
--- a/
util/yaziconv.c
+++ b/
util/yaziconv.c
@@
-1,14
+1,15
@@
/*
/*
- * Copyright (c) 1997-2003, Index Data
+ * Copyright (C) 1995-2007, Index Data ApS
* See the file LICENSE for details.
*
* See the file LICENSE for details.
*
- * $Id: yaziconv.c,v 1.1 2003-04-23 20:34:08 adam Exp $
+ * $Id: yaziconv.c,v 1.9 2007-05-25 16:19:46 marc Exp $
*/
#if HAVE_CONFIG_H
#include <config.h>
#endif
*/
#if HAVE_CONFIG_H
#include <config.h>
#endif
+#include <stdlib.h>
#include <errno.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
#include <string.h>
#include <ctype.h>
@@
-43,6
+44,11
@@
void convert (FILE *inf, yaz_iconv_t cd, int verbose)
{
if (outbuf != outbuf0)
fwrite (outbuf0, 1, outbuf - outbuf0, stdout);
{
if (outbuf != outbuf0)
fwrite (outbuf0, 1, outbuf - outbuf0, stdout);
+ outbuf = outbuf0;
+ outbytesleft = CHUNK_OUT;
+ r = yaz_iconv (cd, 0, 0, &outbuf, &outbytesleft);
+ if (outbuf != outbuf0)
+ fwrite (outbuf0, 1, outbuf - outbuf0, stdout);
break;
}
inbytesleft = r;
break;
}
inbytesleft = r;
@@
-50,8
+56,8
@@
void convert (FILE *inf, yaz_iconv_t cd, int verbose)
}
if (verbose > 1)
{
}
if (verbose > 1)
{
- fprintf (stderr, "yaz_iconv: inbytesleft=%d outbytesleft=%d\n",
- inbytesleft, outbytesleft);
+ fprintf (stderr, "yaz_iconv: inbytesleft=%ld outbytesleft=%ld\n",
+ (long) inbytesleft, (long) outbytesleft);
}
r = yaz_iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
}
r = yaz_iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
@@
-80,7
+86,7
@@
void convert (FILE *inf, yaz_iconv_t cd, int verbose)
}
if (r == 0)
{
}
if (r == 0)
{
- fprintf (stderr, "invalid sequence\n");
+ fprintf (stderr, "invalid sequence due to missing input\n");
return ;
}
inbytesleft += r;
return ;
}
inbytesleft += r;
@@
-147,7
+153,7
@@
int main (int argc, char **argv)
break;
default:
fprintf (stderr, "yaziconv: Usage\n"
break;
default:
fprintf (stderr, "yaziconv: Usage\n"
- "siconv -f encoding -t encoding [-v] [file]\n");
+ "yaziconv -f encoding -t encoding [-v] [file]\n");
exit(1);
}
}
exit(1);
}
}
@@
-179,3
+185,11
@@
int main (int argc, char **argv)
yaz_iconv_close (cd);
return 0;
}
yaz_iconv_close (cd);
return 0;
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+