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
Merge branch 'master' into yaz4
[yaz-moved-to-github.git]
/
src
/
sc.c
diff --git
a/src/sc.c
b/src/sc.c
index
9336e60
..
e0c1ec1
100644
(file)
--- a/
src/sc.c
+++ b/
src/sc.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) 1995-2009 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-41,7
+41,7
@@
struct sc_s {
yaz_sc_t yaz_sc_create(const char *service_name, const char *display_name)
{
yaz_sc_t yaz_sc_create(const char *service_name, const char *display_name)
{
- yaz_sc_t s = xmalloc(sizeof(*s));
+ yaz_sc_t s = (yaz_sc_t) xmalloc(sizeof(*s));
s->service_name = service_name ? xstrdup(service_name) : 0;
s->display_name = display_name ? xstrdup(display_name) : 0;
s->service_name = service_name ? xstrdup(service_name) : 0;
s->display_name = display_name ? xstrdup(display_name) : 0;
@@
-268,7
+268,11
@@
int yaz_sc_program(yaz_sc_t s, int argc, char **argv,
for (i = 1; i < argc; i++)
{
wrbuf_puts(w, " ");
for (i = 1; i < argc; i++)
{
wrbuf_puts(w, " ");
+ if (strchr(argv[i], ' '))
+ wrbuf_puts(w, "\"");
wrbuf_puts(w, argv[i]);
wrbuf_puts(w, argv[i]);
+ if (strchr(argv[i], ' '))
+ wrbuf_puts(w, "\"");
}
wrbuf_puts(w, " -run \"");
wrbuf_puts(w, cwdstr);
}
wrbuf_puts(w, " -run \"");
wrbuf_puts(w, cwdstr);
@@
-373,6
+377,7
@@
void yaz_sc_destroy(yaz_sc_t *s)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab