projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.0.42
[idzebra-moved-to-github.git]
/
dict
/
dictext.c
diff --git
a/dict/dictext.c
b/dict/dictext.c
index
06f13e3
..
3190e3d
100644
(file)
--- a/
dict/dictext.c
+++ b/
dict/dictext.c
@@
-1,8
+1,5
@@
-/* $Id: dictext.c,v 1.9 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2009 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-15,9
+12,9
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
*/
*/
@@
-28,11
+25,12
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <assert.h>
#include <ctype.h>
#include <assert.h>
#include <ctype.h>
-#include <zebrautl.h>
+#include <idzebra/util.h>
+#include <yaz/yaz-util.h>
char *prog;
char *prog;
-int main (int argc, char **argv)
+int main(int argc, char **argv)
{
char *arg;
int ret;
{
char *arg;
int ret;
@@
-42,7
+40,7
@@
int main (int argc, char **argv)
char ipf_buf[1024];
prog = *argv;
char ipf_buf[1024];
prog = *argv;
- while ((ret = options ("8vh", argv, argc, &arg)) != -2)
+ while ((ret = options("8vh", argv, argc, &arg)) != -2)
{
if (ret == 0)
{
{
if (ret == 0)
{
@@
-50,38
+48,38
@@
int main (int argc, char **argv)
inputfile = arg;
else
{
inputfile = arg;
else
{
- logf (LOG_FATAL, "too many files specified\n");
- exit (1);
+ yaz_log(YLOG_FATAL, "too many files specified\n");
+ exit(1);
}
}
else if (ret == 'v')
{
}
}
else if (ret == 'v')
{
- yaz_log_init (yaz_log_mask_str(arg), prog, NULL);
+ yaz_log_init(yaz_log_mask_str(arg), prog, NULL);
}
else if (ret == 'h')
{
}
else if (ret == 'h')
{
- fprintf (stderr, "usage:\n"
- " %s [-8] [-h] [-v n] [file]\n", prog);
- exit (1);
+ fprintf(stderr, "usage:\n"
+ " %s [-8] [-h] [-v n] [file]\n", prog);
+ exit(1);
}
else if (ret == '8')
use8 = 1;
else
{
}
else if (ret == '8')
use8 = 1;
else
{
- logf (LOG_FATAL, "Unknown option '-%s'", arg);
- exit (1);
+ yaz_log(YLOG_FATAL, "Unknown option '-%s'", arg);
+ exit(1);
}
}
if (inputfile)
{
}
}
if (inputfile)
{
- ipf = fopen (inputfile, "r");
+ ipf = fopen(inputfile, "r");
if (!ipf)
{
if (!ipf)
{
- logf (LOG_FATAL|LOG_ERRNO, "cannot open '%s'", inputfile);
- exit (1);
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "cannot open '%s'", inputfile);
+ exit(1);
}
}
}
}
- while (fgets (ipf_buf, 1023, ipf))
+ while (fgets(ipf_buf, 1023, ipf))
{
char *ipf_ptr = ipf_buf;
for (;*ipf_ptr && *ipf_ptr != '\n';ipf_ptr++)
{
char *ipf_ptr = ipf_buf;
for (;*ipf_ptr && *ipf_ptr != '\n';ipf_ptr++)
@@
-97,7
+95,7
@@
int main (int argc, char **argv)
i++;
if (ipf_ptr[i])
ipf_ptr[i++] = '\0';
i++;
if (ipf_ptr[i])
ipf_ptr[i++] = '\0';
- printf ("%s\n", ipf_ptr);
+ printf("%s\n", ipf_ptr);
ipf_ptr += (i-1);
}
}
ipf_ptr += (i-1);
}
}
@@
-107,3
+105,12
@@
int main (int argc, char **argv)
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+