Attachment #323706 for bug #425422

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

Lines 15-21 Link Here

(-)CMakeLists.txt.orig (-1 lines)
15	ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)	15	ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
16		16
17	set(Boost_USE_MULTITHREADED OFF)	17	set(Boost_USE_MULTITHREADED OFF)
18	add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
19	find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)	18	find_package(Boost 1.41 COMPONENTS system filesystem regex REQUIRED)
20	set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES}	19	set(${PROJECT_NAME}_LIBRARIES ${${PROJECT_NAME}_LIBRARIES}
21	${Boost_LIBRARIES})	20	${Boost_LIBRARIES})

Lines 71-77 Link Here

(-)src/config.cc.orig (-1 / +1 lines)
71	return;	71	return;
72	}	72	}
73		73
74	tool_name = fs::path(argv[0]).filename();	74	tool_name = fs::path(argv[0]).filename().string();
75	found = tool_name.find_last_of("-");	75	found = tool_name.find_last_of("-");
76	if(found)	76	if(found)
77	defaultSection = tool_name.substr(found+1);	77	defaultSection = tool_name.substr(found+1);

Lines 157-163 Link Here

(-)src/common.cc.orig (-3 / +3 lines)
157	p /= filesearch;	157	p /= filesearch;
158	}	158	}
159	// Initialize regex filter - use * as default if nothing is given in filesearch	159	// Initialize regex filter - use * as default if nothing is given in filesearch
160	std::string f( p.has_filename() ? p.filename() : "*");	160	std::string f( p.has_filename() ? p.filename().string() : "*");
161		161
162	fs::path dir(system_complete(p).parent_path());	162	fs::path dir(system_complete(p).parent_path());
163	if( is_directory(dir) )	163	if( is_directory(dir) )
Lines 166-173 Link Here
166	it!=boost::filesystem::directory_iterator();	166	it!=boost::filesystem::directory_iterator();
167	++it )	167	++it )
168	{	168	{
169	if( boost::regex_match( it->leaf(), path2regex(f) ) )	169	if( boost::regex_match( it->path().filename().string(), path2regex(f) ) )
170	fileset.push_back(it->string());	170	fileset.push_back(it->path().filename().string());
171	}	171	}
172	return fileset;	172	return fileset;
173	}	173	}

Lines 396-402 Link Here

(-)src/e4rat-collect.cc.orig (-1 / +1 lines)
396	* Parse application list given as arguments	396	* Parse application list given as arguments
397	*/	397	*/
398	for ( ; optind < argc; optind++)	398	for ( ; optind < argc; optind++)
399	project.observeApp(fs::path(argv[optind]).filename());	399	project.observeApp(fs::path(argv[optind]).filename().string());
400		400
401	/*	401	/*
402	* Parse application list on stdin	402	* Parse application list on stdin




        it != end_itr;
        ++it )
    {
        if(it->path().filename().string() == "root")
            continue;
        if(lstat(it->path().filename().c_str(), &st))
            continue;
        if(st.st_rdev == get()->devno)
        {
            get()->deviceName = it->path().filename().string();
            get()->devicePath = "/dev/" + get()->deviceName;
            return 0;
        }

            // the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
            // for convenience set deviceName and devicePath to a common name
            get()->deviceName = "virtual file system";
            get()->devicePath = get()->mount_point.filename().string();
            return 0;
        case 2:
            ss << "fd"; 

Return to bug 425422

Lines 196-208 Link Here

(-)src/device.cc.orig (-4 / +4 lines)
196	it != end_itr;	196	it != end_itr;
197	++it )	197	++it )
198	{	198	{
199	if(it->filename() == "root")	199	if(it->path().filename().string() == "root")
200	continue;	200	continue;
201	if(lstat(it->string().c_str(), &st))	201	if(lstat(it->path().filename().c_str(), &st))
202	continue;	202	continue;
203	if(st.st_rdev == get()->devno)	203	if(st.st_rdev == get()->devno)
204	{	204	{
205	get()->deviceName = it->filename();	205	get()->deviceName = it->path().filename().string();
206	get()->devicePath = "/dev/" + get()->deviceName;	206	get()->devicePath = "/dev/" + get()->deviceName;
207	return 0;	207	return 0;
208	}	208	}
Lines 225-231 Link Here
225	// the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c	225	// the minor number of virtual filesystems are allocated dynamically in function set_anon_super() in fs/super.c
226	// for convenience set deviceName and devicePath to a common name	226	// for convenience set deviceName and devicePath to a common name
227	get()->deviceName = "virtual file system";	227	get()->deviceName = "virtual file system";
228	get()->devicePath = get()->mount_point.filename();	228	get()->devicePath = get()->mount_point.filename().string();
229	return 0;	229	return 0;
230	case 2:	230	case 2:
231	ss << "fd";	231	ss << "fd";