/*
+ Copyright (C) 2000-2003 Kern Sibbald and John Walker
- Copyright 1988, 92,93,94,95,96,97, 1999 Free Software Foundation, Inc.
- Written by John Gilmore, starting 1985-08-25.
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any later
- version.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- Public License for more details.
+ You should have received a copy of the GNU General Public
+ License along with this program; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ MA 02111-1307, USA.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ This file is based on GNU TAR source code. Except for a few key
+ ideas, it has been rewritten for Bacula.
- Massively changed from GNU TAR source code to adapt to Bacula
- by Kern Sibbald, MM
+ Kern Sibbald, MM
+
+ Thanks to the TAR programmers.
*/
#include "bacula.h"
#include "find.h"
-#include "system.h"
-
-
-extern size_t name_max; /* filename max length */
-extern size_t path_max; /* path name max length */
-
-#ifndef HAVE_READDIR_R
-int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
-#endif
-
-
-/* ****FIXME**** debug until stable */
-#undef bmalloc
-#define bmalloc(x) sm_malloc(__FILE__, __LINE__, x)
+extern int32_t name_max; /* filename max length */
+extern int32_t path_max; /* path name max length */
/*
- * Structure for keeping track of hard linked files
+ * Structure for keeping track of hard linked files, we
+ * keep an entry for each hardlinked file that we save,
+ * which is the first one found. For all the other files that
+ * are linked to this one, we save only the directory
+ * entry so we can link it.
*/
struct f_link {
struct f_link *next;
- dev_t dev;
- ino_t ino;
+ dev_t dev; /* device */
+ ino_t ino; /* inode with device is unique */
short linkcount;
- char name[1];
+ uint32_t FileIndex; /* Bacula FileIndex of this file */
+ char name[1]; /* The name */
};
-
-#if HAVE_UTIME_H
-# include <utime.h>
-#else
-struct utimbuf
- {
- long actime;
- long modtime;
- };
-#endif
-
+static void free_dir_ff_pkt(FF_PKT *dir_ff_pkt)
+{
+ free(dir_ff_pkt->fname);
+ free(dir_ff_pkt->link);
+ free_pool_memory(dir_ff_pkt->sys_fname);
+ free(dir_ff_pkt);
+}
/*
* Find a single file.
* handle_file is the callback for handling the file.
* p is the filename
* parent_device is the device we are currently on
- * top_level is 1 when not recursing.
+ * top_level is 1 when not recursing or 0 when
+ * decending into a directory.
*/
int
-find_one_file(FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt), void *pkt,
- char *p, dev_t parent_device, int top_level)
+find_one_file(JCR *jcr, FF_PKT *ff_pkt, int handle_file(FF_PKT *ff, void *hpkt),
+ void *pkt, char *fname, dev_t parent_device, int top_level)
{
- struct utimbuf restore_times;
- int rtn_stat;
-
- ff_pkt->fname = ff_pkt->link = p;
- if (ff_pkt->compute_MD5) {
- ff_pkt->flags |= FO_MD5;
- }
- if (ff_pkt->GZIP_compression) {
- ff_pkt->flags |= FO_GZIP;
- }
-
- /* Use stat if following (rather than dumping) 4.2BSD's symbolic links.
- Otherwise, use lstat (which falls back to stat if no symbolic links). */
-
- if (ff_pkt->dereference != 0
-#if STX_HIDDEN && !_LARGE_FILES /* AIX */
- ? statx(p, &ff_pkt->statp, STATSIZE, STX_HIDDEN)
- : statx(p, &ff_pkt->statp, STATSIZE, STX_HIDDEN | STX_LINK)
-#else
- ? stat(p, &ff_pkt->statp) : lstat(p, &ff_pkt->statp)
-#endif
- )
- {
- /* Cannot stat file */
- ff_pkt->type = FT_NOSTAT;
- ff_pkt->ff_errno = errno;
- return handle_file(ff_pkt, pkt);
- }
-
-Dmsg1(60, "File ----: %s\n", p);
-if (S_ISLNK(ff_pkt->statp.st_mode))
- Dmsg1(60, "Link-------------: %s \n", p);
-
- /* Save current times of this directory in case we need to
- * reset them because the user doesn't want them changed.
- */
- restore_times.actime = ff_pkt->statp.st_atime;
- restore_times.modtime = ff_pkt->statp.st_mtime;
-
-
-#ifdef S_ISHIDDEN
- if (S_ISHIDDEN(ff_pkt->statp.st_mode)) {
- char *new = alloca(strlen(p) + 2);
- if (new) {
- strcpy (new, p);
- strcat (new, "@");
- p = new;
- ff_pkt->link = p;
+ struct utimbuf restore_times;
+ int rtn_stat;
+
+ ff_pkt->fname = ff_pkt->link = fname;
+
+ if (lstat(fname, &ff_pkt->statp) != 0) {
+ /* Cannot stat file */
+ ff_pkt->type = FT_NOSTAT;
+ ff_pkt->ff_errno = errno;
+ return handle_file(ff_pkt, pkt);
+ }
+
+ Dmsg1(300, "File ----: %s\n", fname);
+
+ /* Save current times of this directory in case we need to
+ * reset them because the user doesn't want them changed.
+ */
+ restore_times.actime = ff_pkt->statp.st_atime;
+ restore_times.modtime = ff_pkt->statp.st_mtime;
+
+
+ /*
+ * If this is an Incremental backup, see if file was modified
+ * since our last "save_time", presumably the last Full save
+ * or Incremental.
+ */
+ if (ff_pkt->incremental && !S_ISDIR(ff_pkt->statp.st_mode)) {
+ Dmsg1(300, "Non-directory incremental: %s\n", ff_pkt->fname);
+ /* Not a directory */
+ if (ff_pkt->statp.st_mtime < ff_pkt->save_time
+ && (ff_pkt->mtime_only ||
+ ff_pkt->statp.st_ctime < ff_pkt->save_time)) {
+ /* Incremental option, file not changed */
+ ff_pkt->type = FT_NOCHG;
+ return handle_file(ff_pkt, pkt);
}
- }
-#endif
-
- /* See if we want only new files, and check if this one is too old to
- put in the archive. */
-
- if (ff_pkt->incremental && !S_ISDIR(ff_pkt->statp.st_mode)) {
- Dmsg1(100, "Non-directory incremental: %s\n", ff_pkt->fname);
- /* Not a directory */
- if (ff_pkt->statp.st_mtime < ff_pkt->save_time
- && (ff_pkt->mtime_only ||
- ff_pkt->statp.st_ctime < ff_pkt->save_time)) {
- /* Incremental option, file not changed */
- ff_pkt->type = FT_NOCHG;
- Dmsg1(100, "File not changed: %s\n", ff_pkt->fname);
- Dmsg4(200, "save_time=%d mtime=%d mtime_only=%d st_ctime=%d\n",
- ff_pkt->save_time, ff_pkt->statp.st_mtime,
- ff_pkt->mtime_only, ff_pkt->statp.st_ctime);
- return handle_file(ff_pkt, pkt);
- }
- }
+ }
+/* ***FIXME*** implement this */
#if xxxxxxx
- /* See if we are trying to dump the archive. */
- if (ar_dev && ff_pkt->statp.st_dev == ar_dev && ff_pkt->statp.st_ino == ar_ino) {
- ff_pkt->type = FT_ISARCH;
- return handle_file(ff_pkt, pkt);
- }
+ /* See if we are trying to dump the archive. */
+ if (ar_dev && ff_pkt->statp.st_dev == ar_dev && ff_pkt->statp.st_ino == ar_ino) {
+ ff_pkt->type = FT_ISARCH;
+ return handle_file(ff_pkt, pkt);
+ }
#endif
-
- /* Check for multiple links.
- NOTE: CTG is Masscomp contiguous files
-
- We maintain a list of all such files that we've written so far. Any
- time we see another, we check the list and avoid dumping the data
- again if we've done it once already. */
-
- if (ff_pkt->statp.st_nlink > 1
- && (S_ISREG(ff_pkt->statp.st_mode)
- || S_ISCTG(ff_pkt->statp.st_mode)
- || S_ISCHR(ff_pkt->statp.st_mode)
- || S_ISBLK(ff_pkt->statp.st_mode)
- || S_ISFIFO(ff_pkt->statp.st_mode)
- || S_ISSOCK(ff_pkt->statp.st_mode))) {
-
- struct f_link *lp;
-
- /* FIXME: First quick and dirty. Hashing, etc later. */
+ ff_pkt->LinkFI = 0;
+ /*
+ * Handle hard linked files
+ *
+ * Maintain a list of hard linked files already backed up. This
+ * allows us to ensure that the data of each file gets backed
+ * up only once.
+ */
+ if (ff_pkt->statp.st_nlink > 1
+ && (S_ISREG(ff_pkt->statp.st_mode)
+ || S_ISCHR(ff_pkt->statp.st_mode)
+ || S_ISBLK(ff_pkt->statp.st_mode)
+ || S_ISFIFO(ff_pkt->statp.st_mode)
+ || S_ISSOCK(ff_pkt->statp.st_mode))) {
+
+ struct f_link *lp;
+
+ /* Search link list of hard linked files */
for (lp = ff_pkt->linklist; lp; lp = lp->next)
if (lp->ino == ff_pkt->statp.st_ino && lp->dev == ff_pkt->statp.st_dev) {
ff_pkt->link = lp->name;
- ff_pkt->type = FT_LNKSAVED;
+ ff_pkt->type = FT_LNKSAVED; /* Handle link, file already saved */
+ ff_pkt->LinkFI = lp->FileIndex;
return handle_file(ff_pkt, pkt);
}
- /* Not found. Add it to the list of possible links. */
-
- lp = (struct f_link *)bmalloc(sizeof (struct f_link) + strlen(p));
+ /* File not previously dumped. Chain it into our list. */
+ lp = (struct f_link *)bmalloc(sizeof(struct f_link) + strlen(fname) +1);
lp->ino = ff_pkt->statp.st_ino;
lp->dev = ff_pkt->statp.st_dev;
- strcpy (lp->name, p);
+ strcpy(lp->name, fname);
lp->next = ff_pkt->linklist;
ff_pkt->linklist = lp;
- }
+ ff_pkt->linked = lp; /* mark saved link */
+ } else {
+ ff_pkt->linked = NULL;
+ }
- /* This is not a link to a previously dumped file, so dump it. */
- if (S_ISREG(ff_pkt->statp.st_mode) || S_ISCTG(ff_pkt->statp.st_mode)) {
+ /* This is not a link to a previously dumped file, so dump it. */
+ if (S_ISREG(ff_pkt->statp.st_mode)) {
off_t sizeleft;
- int header_moved;
-
- header_moved = 0;
sizeleft = ff_pkt->statp.st_size;
/* Don't bother opening empty, world readable files. Also do not open
files when archive is meant for /dev/null. */
if (ff_pkt->null_output_device || (sizeleft == 0
- && MODE_R == (MODE_R & ff_pkt->statp.st_mode))) {
+ && MODE_RALL == (MODE_RALL & ff_pkt->statp.st_mode))) {
ff_pkt->type = FT_REGE;
} else {
ff_pkt->type = FT_REG;
}
- return handle_file(ff_pkt, pkt);
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ return rtn_stat;
+
- } else if (S_ISLNK(ff_pkt->statp.st_mode)) {
+ } else if (S_ISLNK(ff_pkt->statp.st_mode)) { /* soft link */
int size;
- char *buffer = (char *)alloca(PATH_MAX + 1);
+ char *buffer = (char *)alloca(path_max + name_max + 102);
- size = readlink(p, buffer, PATH_MAX + 1);
+ size = readlink(fname, buffer, path_max + name_max + 101);
if (size < 0) {
- /* Could not follow link */
- ff_pkt->type = FT_NOFOLLOW;
- ff_pkt->ff_errno = errno;
- return handle_file(ff_pkt, pkt);
+ /* Could not follow link */
+ ff_pkt->type = FT_NOFOLLOW;
+ ff_pkt->ff_errno = errno;
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ return rtn_stat;
+ }
+ buffer[size] = 0;
+ ff_pkt->link = buffer; /* point to link */
+ ff_pkt->type = FT_LNK; /* got a real link */
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
}
- buffer[size] = '\0';
- ff_pkt->link = buffer;
- ff_pkt->type = FT_LNK; /* got a real link */
- return handle_file(ff_pkt, pkt);
+ return rtn_stat;
- } else if (S_ISDIR(ff_pkt->statp.st_mode)) {
+ } else if (S_ISDIR(ff_pkt->statp.st_mode)) {
DIR *directory;
struct dirent *entry, *result;
- char *namebuf;
- size_t buflen;
- size_t len;
+ char *link;
+ int link_len;
+ int len;
int status;
dev_t our_device = ff_pkt->statp.st_dev;
- if (access(p, R_OK) == -1 && geteuid () != 0) {
- /* Could not access() directory */
- ff_pkt->type = FT_NOACCESS;
- ff_pkt->ff_errno = errno;
- return handle_file(ff_pkt, pkt);
+ /*
+ * If we are using Win32 (non-portable) backup API, don't check
+ * access as everything is more complicated, and
+ * in principle, we should be able to access everything.
+ */
+ if (!have_win32_api() || (ff_pkt->flags & FO_PORTABLE)) {
+ if (access(fname, R_OK) == -1 && geteuid() != 0) {
+ /* Could not access() directory */
+ ff_pkt->type = FT_NOACCESS;
+ ff_pkt->ff_errno = errno;
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ return rtn_stat;
+ }
}
- /* Build new prototype name. Ensure exactly one trailing slash. */
- len = strlen(p);
- buflen = len + NAME_FIELD_SIZE;
- namebuf = (char *)bmalloc(buflen + 2);
- strncpy(namebuf, p, buflen);
- while (len >= 1 && namebuf[len - 1] == '/')
+ /* Build a canonical directory name with a trailing slash in link var */
+ len = strlen(fname);
+ link_len = len + 200;
+ link = (char *)bmalloc(link_len + 2);
+ bstrncpy(link, fname, link_len);
+ /* Strip all trailing slashes */
+ while (len >= 1 && link[len - 1] == '/')
len--;
- namebuf[len++] = '/';
- namebuf[len] = '\0';
+ link[len++] = '/'; /* add back one */
+ link[len] = 0;
- ff_pkt->link = namebuf;
+ ff_pkt->link = link;
if (ff_pkt->incremental &&
(ff_pkt->statp.st_mtime < ff_pkt->save_time &&
ff_pkt->statp.st_ctime < ff_pkt->save_time)) {
} else {
ff_pkt->type = FT_DIR;
}
- handle_file(ff_pkt, pkt); /* handle directory entry */
+ /*
+ * Create a temporary ff packet for this directory
+ * entry, and defer handling the directory until
+ * we have recursed into it. This saves the
+ * directory after all files have been processed, and
+ * during the restore, the directory permissions will
+ * be reset after all the files have been restored.
+ */
+ Dmsg1(300, "Create temp ff packet for dir: %s\n", ff_pkt->fname);
+ FF_PKT *dir_ff_pkt = (FF_PKT *)bmalloc(sizeof(FF_PKT));
+ memcpy(dir_ff_pkt, ff_pkt, sizeof(FF_PKT));
+ dir_ff_pkt->fname = bstrdup(ff_pkt->fname);
+ dir_ff_pkt->link = bstrdup(ff_pkt->link);
+ dir_ff_pkt->sys_fname = get_pool_memory(PM_FNAME);
+ dir_ff_pkt->included_files_list = NULL;
+ dir_ff_pkt->excluded_files_list = NULL;
+ dir_ff_pkt->excluded_paths_list = NULL;
+ dir_ff_pkt->linklist = NULL;
+
ff_pkt->link = ff_pkt->fname; /* reset "link" */
- /* See if we are about to recurse into a directory, and avoid doing
- so if the user wants that we do not descend into directories. */
-
- if (ff_pkt->no_recursion) {
- free(namebuf);
+ /*
+ * Do not decend into subdirectories (recurse) if the
+ * user has turned it off for this directory.
+ */
+ if (ff_pkt->flags & FO_NO_RECURSION) {
/* No recursion into this directory */
ff_pkt->type = FT_NORECURSE;
- return handle_file(ff_pkt, pkt);
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ free(link);
+ free_dir_ff_pkt(dir_ff_pkt);
+ return rtn_stat;
}
- /* See if we are crossing from one file system to another, and
- avoid doing so if the user only wants to dump one file system. */
-
- if (ff_pkt->one_file_system && !top_level
- && parent_device != ff_pkt->statp.st_dev) {
- free(namebuf);
- ff_pkt->type = FT_NOFSCHG;
- return handle_file(ff_pkt, pkt);
+ /*
+ * See if we are crossing file systems, and
+ * avoid doing so if the user only wants to dump one file system.
+ */
+ if (!top_level && !(ff_pkt->flags & FO_MULTIFS) &&
+ parent_device != ff_pkt->statp.st_dev) {
+ /* returning here means we do not handle this directory */
+ ff_pkt->type = FT_NOFSCHG;
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ free(link);
+ free_dir_ff_pkt(dir_ff_pkt);
+ return rtn_stat;
}
-
- /* Now output all the files in the directory. */
-
- errno = 0; /* FIXME: errno should be read-only */
-
- if ((directory = opendir(p)) == NULL) {
- free(namebuf);
- ff_pkt->type = FT_NOOPEN;
- ff_pkt->ff_errno = errno;
- return handle_file(ff_pkt, pkt);
+ /*
+ * Decend into or "recurse" into the directory to read
+ * all the files in it.
+ */
+ errno = 0;
+ if ((directory = opendir(fname)) == NULL) {
+ ff_pkt->type = FT_NOOPEN;
+ ff_pkt->ff_errno = errno;
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ free(link);
+ free_dir_ff_pkt(dir_ff_pkt);
+ return rtn_stat;
}
- /* FIXME: Should speed this up by cd-ing into the dir. */
-
+ /*
+ * Process all files in this directory entry (recursing).
+ * This would possibly run faster if we chdir to the directory
+ * before traversing it.
+ */
rtn_stat = 1;
- entry = (struct dirent *)malloc(sizeof(struct dirent) + name_max + 10);
- for ( ;; ) {
- char *p;
-
- status = readdir_r(directory, entry, &result);
- Dmsg3(200, "readdir stat=%d result=%x name=%s\n", status, result,
- entry->d_name);
- if (status != 0 || result == NULL) {
- break;
- }
- p = entry->d_name;
- /* Skip `.', `..', and excluded file names. */
- if (p[0] == '\0' || (p[0] == '.' && (p[1] == '\0' ||
- (p[1] == '.' && p[2] == '\0')))) {
- continue;
- }
-
- if ((int)NAMLEN(entry) + len >= buflen) {
- buflen = len + NAMLEN(entry);
- namebuf = (char *)brealloc(namebuf, buflen + 2);
- }
- strcpy(namebuf + len, entry->d_name);
- if (!file_is_excluded(ff_pkt, namebuf)) {
- rtn_stat = find_one_file(ff_pkt, handle_file, pkt, namebuf, our_device, 0);
- }
+ entry = (struct dirent *)malloc(sizeof(struct dirent) + name_max + 100);
+ for ( ; !job_canceled(jcr); ) {
+ char *p, *q;
+ int i;
+
+ status = readdir_r(directory, entry, &result);
+ if (status != 0 || result == NULL) {
+ break;
+ }
+ ASSERT(name_max+1 > (int)sizeof(struct dirent) + (int)NAMELEN(entry));
+ p = entry->d_name;
+ /* Skip `.', `..', and excluded file names. */
+ if (p[0] == '\0' || (p[0] == '.' && (p[1] == '\0' ||
+ (p[1] == '.' && p[2] == '\0')))) {
+ continue;
+ }
+
+ if ((int)NAMELEN(entry) + len >= link_len) {
+ link_len = len + NAMELEN(entry) + 1;
+ link = (char *)brealloc(link, link_len + 1);
+ }
+ q = link + len;
+ for (i=0; i < (int)NAMELEN(entry); i++) {
+ *q++ = *p++;
+ }
+ *q = 0;
+ if (!file_is_excluded(ff_pkt, link)) {
+ rtn_stat = find_one_file(jcr, ff_pkt, handle_file, pkt, link, our_device, 0);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ }
}
closedir(directory);
- free(namebuf);
+ free(link);
free(entry);
+
+ /*
+ * Now that we have recursed through all the files in the
+ * directory, we "save" the directory so that after all
+ * the files are restored, this entry will serve to reset
+ * the directory modes and dates. Temp directory values
+ * were used without this record.
+ */
+ handle_file(dir_ff_pkt, pkt); /* handle directory entry */
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = dir_ff_pkt->FileIndex;
+ }
+ free_dir_ff_pkt(dir_ff_pkt);
+
if (ff_pkt->atime_preserve) {
- utime(p, &restore_times);
+ utime(fname, &restore_times);
}
return rtn_stat;
- } /* end check for directory */
-
- /* The only remaining types are special (character, ...) files */
- ff_pkt->type = FT_SPEC;
- return handle_file(ff_pkt, pkt);
+ } /* end check for directory */
+
+ /*
+ * If it is explicitly mentioned (i.e. top_level) and is
+ * a block device, we do a raw backup of it or if it is
+ * a fifo, we simply read it.
+ */
+#ifdef HAVE_FREEBSD_OS
+ /*
+ * On FreeBSD, all block devices are character devices, so
+ * to be able to read a raw disk, we need the check for
+ * a character device.
+ * crw-r----- 1 root operator - 116, 0x00040002 Jun 9 19:32 /dev/ad0s3
+ * crw-r----- 1 root operator - 116, 0x00040002 Jun 9 19:32 /dev/rad0s3
+ */
+ if (top_level && (S_ISBLK(ff_pkt->statp.st_mode) || S_ISCHR(ff_pkt->statp.st_mode))) {
+#else
+ if (top_level && S_ISBLK(ff_pkt->statp.st_mode)) {
+#endif
+ ff_pkt->type = FT_RAW; /* raw partition */
+ } else if (top_level && S_ISFIFO(ff_pkt->statp.st_mode) &&
+ ff_pkt->flags & FO_READFIFO) {
+ ff_pkt->type = FT_FIFO;
+ } else {
+ /* The only remaining types are special (character, ...) files */
+ ff_pkt->type = FT_SPEC;
+ }
+ rtn_stat = handle_file(ff_pkt, pkt);
+ if (ff_pkt->linked) {
+ ff_pkt->linked->FileIndex = ff_pkt->FileIndex;
+ }
+ return rtn_stat;
}
-void term_find_one(FF_PKT *ff)
+int term_find_one(FF_PKT *ff)
{
- struct f_link *lp, *lc;
+ struct f_link *lp, *lc;
+ int count = 0;
- /* Free up list of hard linked files */
- for (lp = ff->linklist; lp;) {
- lc = lp;
- lp = lp->next;
- if (lc)
- free(lc);
- }
- return;
+ /* Free up list of hard linked files */
+ for (lp = ff->linklist; lp;) {
+ lc = lp;
+ lp = lp->next;
+ if (lc) {
+ free(lc);
+ count++;
+ }
+ }
+ return count;
}
projects / bacula / bacula / blobdiff