*/
#ifndef lint
-static char sccsid[] = "@(#)misc.c 5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)misc.c 5.15 (Berkeley) %G%";
#endif /* not lint */
#include <sys/param.h>
void
-blkpr(av)
+blkpr(fp, av)
+ FILE *fp;
register Char **av;
{
for (; *av; av++) {
- xprintf("%s", short2str(*av));
+ (void) fprintf(fp, "%s", short2str(*av));
if (av[1])
- xprintf(" ");
+ (void) fprintf(fp, " ");
}
}
register int f;
for (f = 0; f < NOFILE; f++)
- if (f != SHIN && f != SHOUT && f != SHDIAG && f != OLDSTD &&
+ if (f != SHIN && f != SHOUT && f != SHERR && f != OLDSTD &&
f != FSHTTY)
(void) close(f);
}
void
donefds()
{
-
(void) close(0);
(void) close(1);
(void) close(2);
+
didfds = 0;
}
return (i);
if (j >= 0) {
(void) dup2(i, j);
+ if (j != i)
+ (void) close(i);
return (j);
}
j = dcopy(i, j);
register Char **v;
register int c;
{
- register Char **u = v;
+ register Char **u;
- while (*u && --c >= 0)
- xfree((ptr_t) * u++);
+ for (u = v; *u && --c >= 0; u++)
+ xfree((ptr_t) *u);
(void) blkcpy(v, u);
}