Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fill up the directory hierarchy so that leaf files are not ignored if

Browse Source 
specified by themselves.
This commit is contained in:
christos 2013-02-05 00:59:03 +00:00
parent 8da956dc0e
commit c4e4c061b3
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
usr.sbin/mtree/only.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: only.c,v 1.1 2013/02/03 19:15:17 christos Exp $ */
/* $NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: only.c,v 1.1 2013/02/03 19:15:17 christos Exp $");
__RCSID("$NetBSD: only.c,v 1.2 2013/02/05 00:59:03 christos Exp $");
#endif
#include <sys/param.h>
@ -86,14 +86,10 @@ hash_find(const char *str, uint32_t *h)
}
static void
hash_insert(char *str)
hash_insert(char *str, uint32_t h)
{
uint32_t h;
struct hentry *e;
if (hash_find(str, &h))
err(1, "Duplicate entry %s", str);
if ((e = malloc(sizeof(*e))) == NULL)
mtree_err("memory allocation error");
@ -103,6 +99,26 @@ hash_insert(char *str)
table[h] = e;
}
static void
fill(char *str)
{
uint32_t h;
char *ptr = strrchr(str, '/');
if (ptr == NULL)
return;
*ptr = '\0';
if (!hash_find(str, &h)) {
char *x = strdup(str);
if (x == NULL)
mtree_err("memory allocation error");
hash_insert(x, h);
fill(str);
}
*ptr = '/';
}
void
load_only(const char *fname)
{
@ -113,8 +129,13 @@ load_only(const char *fname)
if ((fp = fopen(fname, "r")) == NULL)
err(1, "Cannot open `%s'", fname);
while ((line = fparseln(fp, &len, &lineno, NULL, FPARSELN_UNESCALL)))
hash_insert(line);
while ((line = fparseln(fp, &len, &lineno, NULL, FPARSELN_UNESCALL))) {
uint32_t h;
if (hash_find(line, &h))
err(1, "Duplicate entry %s", line);
hash_insert(line, h);
fill(line);
}
fclose(fp);
loaded = true;