projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactored sbr/getfolder.c
[mmh]
/
sbr
/
showfile.c
diff --git
a/sbr/showfile.c
b/sbr/showfile.c
index
ac9fc69
..
3f23801
100644
(file)
--- a/
sbr/showfile.c
+++ b/
sbr/showfile.c
@@
-10,7
+10,7
@@
int
int
-showfile (char **arg, char *file)
+showfile(char **arg, char *file)
{
pid_t pid;
int isdraft, vecp;
{
pid_t pid;
int isdraft, vecp;
@@
-24,19
+24,19
@@
showfile (char **arg, char *file)
** then really invoked the mhlproc instead
** (which is usually mhl anyway).
*/
** then really invoked the mhlproc instead
** (which is usually mhl anyway).
*/
- if (!strcmp (r1bindex (lproc, '/'), "mhl"))
+ if (!strcmp(mhbasename(lproc), "mhl"))
lproc = mhlproc;
switch (pid = vfork()) {
case -1:
/* fork error */
lproc = mhlproc;
switch (pid = vfork()) {
case -1:
/* fork error */
- advise ("fork", "unable to");
+ advise("fork", "unable to");
return 1;
case 0:
/* child */
vecp = 0;
return 1;
case 0:
/* child */
vecp = 0;
- vec[vecp++] = r1bindex (lproc, '/');
+ vec[vecp++] = mhbasename(lproc);
isdraft = 1;
if (arg) {
while (*arg) {
isdraft = 1;
if (arg) {
while (*arg) {
@@
-46,20
+46,20
@@
showfile (char **arg, char *file)
}
}
if (isdraft) {
}
}
if (isdraft) {
- if (!strcmp (vec[0], "show"))
+ if (!strcmp(vec[0], "show"))
vec[vecp++] = "-file";
vec[vecp++] = file;
}
vec[vecp] = NULL;
vec[vecp++] = "-file";
vec[vecp++] = file;
}
vec[vecp] = NULL;
- execvp (lproc, vec);
- fprintf (stderr, "unable to exec ");
- perror (lproc);
- _exit (-1);
+ execvp(lproc, vec);
+ fprintf(stderr, "unable to exec ");
+ perror(lproc);
+ _exit(-1);
default:
/* parent */
default:
/* parent */
- return (pidwait (pid, -1) & 0377 ? 1 : 0);
+ return (pidwait(pid, -1) & 0377 ? 1 : 0);
}
return 1; /* NOT REACHED */
}
return 1; /* NOT REACHED */