From 24f1f8633a8581af617852057dba131eafccc6b2 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 22 Feb 2010 10:12:02 +0100 Subject: [PATCH] Temp remove savecwd to make Win32 build --- bacula/src/filed/job.c | 8 ++++---- bacula/src/findlib/Makefile.in | 2 +- bacula/src/findlib/find.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c index b03976476b..3e193dea86 100644 --- a/bacula/src/filed/job.c +++ b/bacula/src/filed/job.c @@ -227,12 +227,12 @@ void *handle_client_request(void *dirp) JCR *jcr; BSOCK *dir = (BSOCK *)dirp; const char jobname[12] = "*Director*"; - saveCWD save_cwd; +// saveCWD save_cwd; jcr = new_jcr(sizeof(JCR), filed_free_jcr); /* create JCR */ jcr->dir_bsock = dir; jcr->ff = init_find_files(); - save_cwd.save(jcr); +// save_cwd.save(jcr); jcr->start_time = time(NULL); jcr->RunScripts = New(alist(10, not_owned_by_alist)); jcr->last_fname = get_pool_memory(PM_FNAME); @@ -383,8 +383,8 @@ void *handle_client_request(void *dirp) ff->fileset = NULL; Dmsg0(100, "Calling term_find_files\n"); term_find_files(jcr->ff); - save_cwd.restore(jcr); - save_cwd.release(); +// save_cwd.restore(jcr); +// save_cwd.release(); jcr->ff = NULL; Dmsg0(100, "Done with term_find_files\n"); free_jcr(jcr); /* destroy JCR record */ diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in index 7c4ad8a432..41077f7c65 100644 --- a/bacula/src/findlib/Makefile.in +++ b/bacula/src/findlib/Makefile.in @@ -22,7 +22,7 @@ dummy: # # include files installed when using libtool # -INCLUDE_FILES = bfile.h find.h protos.h savecwd.h +INCLUDE_FILES = bfile.h find.h protos.h # LIBBACFIND_SRCS = find.c match.c find_one.c attribs.c create_file.c \ diff --git a/bacula/src/findlib/find.h b/bacula/src/findlib/find.h index 3fa6afcaee..4033ad316f 100644 --- a/bacula/src/findlib/find.h +++ b/bacula/src/findlib/find.h @@ -36,7 +36,6 @@ #include "jcr.h" #include "bfile.h" -#include "savecwd.h" #include "../filed/fd_plugins.h" #ifdef HAVE_DIRENT_H -- 2.39.5