~mdw
/
xtoys
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take advantage of new dynamic string macros.
[xtoys]
/
xcatch.c
diff --git
a/xcatch.c
b/xcatch.c
index
a341cb1
..
fd0e0d6
100644
(file)
--- a/
xcatch.c
+++ b/
xcatch.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: xcatch.c,v 1.
5 1999/05/05 18:55:18
mdw Exp $
+ * $Id: xcatch.c,v 1.
7 1999/05/21 22:09:19
mdw Exp $
*
* Catch input and trap it in an X window
*
*
* Catch input and trap it in an X window
*
@@
-29,6
+29,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: xcatch.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: xcatch.c,v $
+ * Revision 1.7 1999/05/21 22:09:19 mdw
+ * Take advantage of new dynamic string macros.
+ *
+ * Revision 1.6 1999/05/19 20:41:15 mdw
+ * Track gratuitous change in mdwopt interface.
+ *
* Revision 1.5 1999/05/05 18:55:18 mdw
* Block SIGCHLD around the `fork' call to prevent a race.
*
* Revision 1.5 1999/05/05 18:55:18 mdw
* Block SIGCHLD around the `fork' call to prevent a race.
*
@@
-267,8
+273,8
@@
int main(int argc, char *argv[])
{ "help", 0, 0, 'h' },
{ "usage", 0, 0, 'u' },
{ "version", 0, 0, 'v' },
{ "help", 0, 0, 'h' },
{ "usage", 0, 0, 'u' },
{ "version", 0, 0, 'v' },
- { "file",
gFlag_argReq,
0, 'f' },
- { "font",
gFlag_argReq,
0, 'F' },
+ { "file",
OPTF_ARGREQ,
0, 'f' },
+ { "font",
OPTF_ARGREQ,
0, 'F' },
{ 0, 0, 0, 0 }
};
int i = mdwopt(argc, argv, "huvf:F:", opt, 0, 0, 0);
{ 0, 0, 0, 0 }
};
int i = mdwopt(argc, argv, "huvf:F:", opt, 0, 0, 0);
@@
-352,7
+358,7
@@
int main(int argc, char *argv[])
if (kid < 0)
die(1, "couldn't fork: %s", strerror(errno));
if (kid == 0) {
if (kid < 0)
die(1, "couldn't fork: %s", strerror(errno));
if (kid == 0) {
- dstr d;
+ dstr d
= DSTR_INIT
;
close(pfd[0]);
if (pfd[1] != STDOUT_FILENO)
close(pfd[0]);
if (pfd[1] != STDOUT_FILENO)
@@
-363,10
+369,10
@@
int main(int argc, char *argv[])
close(pfd[1]);
execvp(argv[optind], argv + optind);
close(pfd[1]);
execvp(argv[optind], argv + optind);
- dstr_create(&d);
dstr_putf(&d, "%s: couldn't run `%s': %s\n",
QUIS, argv[optind], strerror(errno));
write(STDERR_FILENO, d.buf, d.len);
dstr_putf(&d, "%s: couldn't run `%s': %s\n",
QUIS, argv[optind], strerror(errno));
write(STDERR_FILENO, d.buf, d.len);
+ dstr_destroy(&d);
_exit(127);
}
_exit(127);
}