Bruce/bb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:spilt/bb

Browse Source
This commit is contained in:
Bruce Hill 2019-06-08 20:54:25 -07:00
commit f2151f7835
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bb.c
View File

@ -744,7 +744,7 @@ entry_t* load_entry(bb_t *bb, const char *path)
strcpy(pbuf, bb->path); strcpy(pbuf, bb->path);
strcat(pbuf, path); strcat(pbuf, path);
} }
if (pbuf[strlen(pbuf)-1] == '/') if (pbuf[strlen(pbuf)-1] == '/' && pbuf[1])
pbuf[strlen(pbuf)-1] = '\0'; pbuf[strlen(pbuf)-1] = '\0';
// Check for pre-existing: // Check for pre-existing:
@ -768,9 +768,13 @@ entry_t* load_entry(bb_t *bb, const char *path)
char *end = stpcpy(entry->fullname, pbuf); char *end = stpcpy(entry->fullname, pbuf);
if (linkpathlen >= 0) if (linkpathlen >= 0)
entry->linkname = strcpy(end + 1, linkbuf); entry->linkname = strcpy(end + 1, linkbuf);
entry->name = strrchr(entry->fullname, '/'); if (strcmp(entry->fullname, "/") == 0) {
if (!entry->name) err("No slash found in '%s'", entry->fullname); entry->name = entry->fullname;
++entry->name; } else {
entry->name = strrchr(entry->fullname, '/');
if (!entry->name) err("No slash found in '%s' from '%s'", entry->fullname, path);
++entry->name;
}
if (S_ISLNK(filestat.st_mode)) if (S_ISLNK(filestat.st_mode))
entry->linkedmode = linkedstat.st_mode; entry->linkedmode = linkedstat.st_mode;
entry->info = filestat; entry->info = filestat;