Remove a needless complication - parent directory already has a trailing /.

This commit is contained in:
Jordan K. Hubbard 1995-05-28 09:43:36 +00:00
parent adc0fd37fc
commit 34375f5af0
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=8812
2 changed files with 6 additions and 8 deletions

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.28 1995/05/28 03:04:49 jkh Exp $
* $Id: dist.c,v 1.29 1995/05/28 07:05:21 phk Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -223,7 +223,7 @@ distExtract(char *parent, Distribution *me)
{
int i, status;
int cpid, zpid, fd, fd2, chunk, numchunks;
char dparent[FILENAME_MAX], *path, *dist, buf[10240];
char *path, *dist, buf[10240];
const char *tmp;
Attribs *dist_attr;
@ -243,9 +243,8 @@ distExtract(char *parent, Distribution *me)
goto done;
}
snprintf(dparent, FILENAME_MAX, "%s/", parent ? parent : me[i].my_name);
dist = me[i].my_name;
path = dparent ? dparent : "";
path = parent ? parent : me[i].my_name;
snprintf(buf, 512, "%s%s.tgz", path, dist);
fd = (*mediaDevice->get)(buf);

View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.28 1995/05/28 03:04:49 jkh Exp $
* $Id: dist.c,v 1.29 1995/05/28 07:05:21 phk Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -223,7 +223,7 @@ distExtract(char *parent, Distribution *me)
{
int i, status;
int cpid, zpid, fd, fd2, chunk, numchunks;
char dparent[FILENAME_MAX], *path, *dist, buf[10240];
char *path, *dist, buf[10240];
const char *tmp;
Attribs *dist_attr;
@ -243,9 +243,8 @@ distExtract(char *parent, Distribution *me)
goto done;
}
snprintf(dparent, FILENAME_MAX, "%s/", parent ? parent : me[i].my_name);
dist = me[i].my_name;
path = dparent ? dparent : "";
path = parent ? parent : me[i].my_name;
snprintf(buf, 512, "%s%s.tgz", path, dist);
fd = (*mediaDevice->get)(buf);