View | Details | Raw Unified
Collapse All | Expand All

(-) file_not_specified_in_diff (-29 / +43 lines)
 Lines 20-25    Link Here 
#include "MemoryPool.h"
#include "MemoryPool.h"
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <cstring>
#include "i18n.h"
#include "i18n.h"
 Lines 23-28    Link Here 
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <rlog/Error.h>
#include <rlog/RLogChannel.h>
#include <rlog/RLogChannel.h>
#include <cstring>
#include "i18n.h"
#include "i18n.h"
 Lines 23-29    Link Here 
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <fcntl.h>
#include <fcntl.h>
#include <errno.h>
#include <cerrno>
/*
/*
    - Version 2:0 adds support for a per-file initialization vector with a
    - Version 2:0 adds support for a per-file initialization vector with a
 Lines 22-28    Link Here 
#include "../config.h"
#include "../config.h"
#include <string.h>
#include <cstring>
#define NO_DES
#define NO_DES
 Lines 23-28    Link Here 
#include <sys/stat.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <fcntl.h>
#include <unistd.h>
#include <unistd.h>
#include <cstring>
using namespace std;
using namespace std;
 Lines 17-22    Link Here 
#include "ConfigVar.h"
#include "ConfigVar.h"
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <cstring>
using namespace rlog;
using namespace rlog;
 Lines 22-30    Link Here 
#include <sys/stat.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/types.h>
#include <errno.h>
#include <cerrno>
#include <stdio.h>
#include <cstring>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <pthread.h>
#include <pthread.h>
#include <unistd.h>
#include <unistd.h>
#ifdef linux
#ifdef linux
 Lines 19-25    Link Here 
// of sys/stat.h or other system headers (to be safe)
// of sys/stat.h or other system headers (to be safe)
#include "encfs.h"
#include "encfs.h"
#include <errno.h>
#include <cstring>
#include <cerrno>
#include <sys/stat.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/types.h>
#include <fcntl.h>
#include <fcntl.h>
 Lines 45-53    Link Here 
#include <fcntl.h>
#include <fcntl.h>
#include <unistd.h>
#include <unistd.h>
#include <ctype.h>
#include <ctype.h>
#include <stdio.h>
#include <cstdio>
#include <stdlib.h>
#include <cstdlib>
#include <errno.h>
#include <cerrno>
#include <cstring>
#include <iostream>
#include <iostream>
#include <sstream>
#include <sstream>
 Lines 22-27    Link Here 
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <rlog/Error.h>
#include <rlog/RLogChannel.h>
#include <rlog/RLogChannel.h>
#include <cstring>
#include "i18n.h"
#include "i18n.h"
 Lines 21-26    Link Here 
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <rlog/Error.h>
#include <cstring>
#include "i18n.h"
#include "i18n.h"
 Lines 19-26    Link Here 
#include "MemoryPool.h"
#include "MemoryPool.h"
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <stdlib.h>
#include <cstdlib>
#include <string.h>
#include <cstring>
#include "config.h"
#include "config.h"
#include <pthread.h>
#include <pthread.h>
 Lines 26-31    Link Here 
// for static build.  Need to reference the modules which are registered at
// for static build.  Need to reference the modules which are registered at
// run-time, to ensure that the linker doesn't optimize them away.
// run-time, to ensure that the linker doesn't optimize them away.
#include <iostream>
#include <iostream>
#include <cstring>
#include "BlockNameIO.h"
#include "BlockNameIO.h"
#include "StreamNameIO.h"
#include "StreamNameIO.h"
#include "NullNameIO.h"
#include "NullNameIO.h"
 Lines 21-26    Link Here 
#include "Interface.h"
#include "Interface.h"
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <cstring>
using namespace std;
using namespace std;
using namespace rel;
using namespace rel;
 Lines 19-24    Link Here 
#include "Cipher.h"
#include "Cipher.h"
#include "base64.h"
#include "base64.h"
#include <cstring>
using namespace rel;
using namespace rel;
 Lines 20-26    Link Here 
#include "PtrImpl.h"
#include "PtrImpl.h"
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <stdlib.h>
#include <cstdlib>
using namespace std;
using namespace std;
using namespace rel;
using namespace rel;
 Lines 20-26    Link Here 
#include "Ptr.h"
#include "Ptr.h"
#include <stdlib.h>
#include <cstdlib>
using namespace rel;
using namespace rel;
 Lines 28-34    Link Here 
#include <sys/stat.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <fcntl.h>
#include <errno.h>
#include <cerrno>
#include <cstring>
using namespace std;
using namespace std;
 Lines 31-37    Link Here 
#include "MemoryPool.h"
#include "MemoryPool.h"
#include "Mutex.h"
#include "Mutex.h"
#include <string.h>
#include <cstring>
#include <sys/mman.h>
#include <sys/mman.h>
 Lines 22-27    Link Here 
#include <rlog/rlog.h>
#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <rlog/Error.h>
#include <cstring>
#include "i18n.h"
#include "i18n.h"
 Lines 17-28    Link Here 
#include "encfs.h"
#include "encfs.h"
#include <stdio.h>
#include <cstdio>
#include <string.h>
#include <cstring>
#include <unistd.h>
#include <unistd.h>
#include <fcntl.h>
#include <fcntl.h>
#include <dirent.h>
#include <dirent.h>
#include <errno.h>
#include <cerrno>
#include <sys/statvfs.h>
#include <sys/statvfs.h>
#include <sys/types.h>
#include <sys/types.h>
 Lines 28-34    Link Here 
#endif
#endif
#ifndef linux
#ifndef linux
#include <errno.h>
#include <cerrno>
static __inline int setfsuid(uid_t uid)
static __inline int setfsuid(uid_t uid)
{
{
 Lines 25-34    Link Here 
#include <sstream>
#include <sstream>
#include <assert.h>
#include <assert.h>
#include <stdio.h>
#include <cstdio>
#include <unistd.h>
#include <unistd.h>
#include <sys/time.h>
#include <sys/time.h>
#include <errno.h>
#include <cerrno>
#include <getopt.h>
#include <getopt.h>
 Lines 36-49    Link Here 
#ifndef HAVE_READPASSPHRASE
#ifndef HAVE_READPASSPHRASE
#include <signal.h>
#include <signal.h>
#include <stdio.h>
#include <cstdio>
#include <errno.h>
#include <cerrno>
#include <sys/types.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <fcntl.h>
#include <unistd.h>
#include <unistd.h>
#include <paths.h>
#include <paths.h>
#include <string.h>
#include <cstring>
#include <ctype.h>
#include <ctype.h>
#include <termios.h>
#include <termios.h>
 Lines 22-28    Link Here 
#include <iostream>
#include <iostream>
#include <stdlib.h>
#include <cstdlib>
#include "Cipher.h"
#include "Cipher.h"
#include "DirNode.h"
#include "DirNode.h"
 Lines 17-23    Link Here 
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
   USA.  */
   USA.  */
/* Tell glibc's <stdio.h> to provide a prototype for vasprintf().
/* Tell glibc's <cstdio> to provide a prototype for vasprintf().
   This must come before <config.h> because <config.h> may include
   This must come before <config.h> because <config.h> may include
   <features.h>, and once <features.h> has been included, it's too late.  */
   <features.h>, and once <features.h> has been included, it's too late.  */
#ifndef _GNU_SOURCE
#ifndef _GNU_SOURCE
 Lines 28-37    Link Here 
#include "autosprintf.h"
#include "autosprintf.h"
#include <stdarg.h>
#include <stdarg.h>
#include <stdlib.h>
#include <cstdlib>
#include <string.h>
#include <cstring>
//#include "lib-asprintf.h"
//#include "lib-asprintf.h"
#include <stdio.h>
#include <cstdio>
namespace gnu
namespace gnu
{
{