Attachment #148644 for bug #216227

View | Details | Raw Unified | Return to bug 216227
Collapse All | Expand All




++ encfs/BlockFileIO.cpp

#include "MemoryPool.h"

#include <rlog/rlog.h>
#include <cstring>

#include "i18n.h"

++ encfs/BlockNameIO.cpp

#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <rlog/RLogChannel.h>
#include <cstring>

#include "i18n.h"

++ encfs/CipherFileIO.cpp

#include <rlog/rlog.h>

#include <fcntl.h>
#include <cerrno>

/*
    - Version 2:0 adds support for a per-file initialization vector with a
++ encfs/CipherV3.cpp


#include "../config.h"

#include <cstring>

#define NO_DES

++ encfs/Config.cpp

#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <cstring>


using namespace std;
++ encfs/ConfigVar.cpp


#include "ConfigVar.h"
#include <rlog/rlog.h>
#include <cstring>

using namespace rlog;

++ encfs/DirNode.cpp


#include <sys/stat.h>
#include <sys/types.h>
#include <cerrno>
#include <cstring>
#include <cstdio>
#include <cstdlib>
#include <pthread.h>
#include <unistd.h>
#ifdef linux
++ encfs/FileNode.cpp

// of sys/stat.h or other system headers (to be safe)
#include "encfs.h"

#include <cstring>
#include <cerrno>
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
++ encfs/FileUtils.cpp

#include <fcntl.h>
#include <unistd.h>
#include <ctype.h>
#include <cstdio>
#include <cstdlib>
#include <cerrno>
#include <cstring>

#include <iostream>
#include <sstream>
++ encfs/MACFileIO.cpp

#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <rlog/RLogChannel.h>
#include <cstring>

#include "i18n.h"

++ encfs/MACFileIOCompat.cpp


#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <cstring>

#include "i18n.h"

++ encfs/MemoryPool.cpp

#include "MemoryPool.h"
#include <rlog/rlog.h>

#include <cstdlib>
#include <cstring>

#include "config.h"
#include <pthread.h>
++ encfs/NameIO.cpp

// for static build.  Need to reference the modules which are registered at
// run-time, to ensure that the linker doesn't optimize them away.
#include <iostream>
#include <cstring>
#include "BlockNameIO.h"
#include "StreamNameIO.h"
#include "NullNameIO.h"
++ encfs/NullCipher.cpp

#include "Interface.h"

#include <rlog/rlog.h>
#include <cstring>

using namespace std;
using namespace rel;
++ encfs/NullNameIO.cpp


#include "Cipher.h"
#include "base64.h"
#include <cstring>

using namespace rel;

++ encfs/OpaqueValue.cpp

#include "PtrImpl.h"
#include <rlog/rlog.h>

#include <cstdlib>

using namespace std;
using namespace rel;
++ encfs/Ptr.cpp


#include "Ptr.h"

#include <cstdlib>

using namespace rel;

++ encfs/RawFileIO.cpp

#include <sys/stat.h>
#include <fcntl.h>

#include <cerrno>
#include <cstring>

using namespace std;

++ encfs/SSL_Cipher.cpp

#include "MemoryPool.h"
#include "Mutex.h"

#include <cstring>

#include <sys/mman.h>

++ encfs/StreamNameIO.cpp


#include <rlog/rlog.h>
#include <rlog/Error.h>
#include <cstring>

#include "i18n.h"

++ encfs/encfs.cpp


#include "encfs.h"

#include <cstdio>
#include <cstring>
#include <unistd.h>
#include <fcntl.h>
#include <dirent.h>
#include <cerrno>
#include <sys/statvfs.h>

#include <sys/types.h>
++ encfs/encfs.h

#endif

#ifndef linux
#include <cerrno>

static __inline int setfsuid(uid_t uid)
{
++ encfs/main.cpp

#include <sstream>

#include <assert.h>
#include <cstdio>
#include <unistd.h>
#include <sys/time.h>
#include <cerrno>

#include <getopt.h>

++ encfs/readpassphrase.cpp

#ifndef HAVE_READPASSPHRASE

#include <signal.h>
#include <cstdio>
#include <cerrno>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <paths.h>
#include <cstring>
#include <ctype.h>

#include <termios.h>
++ encfs/test.cpp


#include <iostream>

#include <cstdlib>

#include "Cipher.h"
#include "DirNode.h"
++ intl/autosprintf.cpp

   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
   USA.  */

/* Tell glibc's <cstdio> to provide a prototype for vasprintf().
   This must come before <config.h> because <config.h> may include
   <features.h>, and once <features.h> has been included, it's too late.  */
#ifndef _GNU_SOURCE

#include "autosprintf.h"

#include <stdarg.h>
#include <cstdlib>
#include <cstring>
//#include "lib-asprintf.h"
#include <cstdio>

namespace gnu
{

Return to bug 216227

Line Link Here

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