Remove the quickExit function
This commit is contained in:
		
							parent
							
								
									4c9e3fa641
								
							
						
					
					
						commit
						10dcee99ed
					
				
					 4 changed files with 8 additions and 18 deletions
				
			
		| 
						 | 
				
			
			@ -847,9 +847,9 @@ void killUser(uid_t uid)
 | 
			
		|||
        } catch (std::exception & e) {
 | 
			
		||||
            std::cerr << format("killing processes belonging to uid `%1%': %2%")
 | 
			
		||||
                % uid % e.what() << std::endl;
 | 
			
		||||
            quickExit(1);
 | 
			
		||||
            _exit(1);
 | 
			
		||||
        }
 | 
			
		||||
        quickExit(0);
 | 
			
		||||
        _exit(0);
 | 
			
		||||
    }
 | 
			
		||||
    
 | 
			
		||||
    /* parent */
 | 
			
		||||
| 
						 | 
				
			
			@ -905,7 +905,7 @@ string runProgram(Path program, bool searchPath, const Strings & args)
 | 
			
		|||
        } catch (std::exception & e) {
 | 
			
		||||
            std::cerr << "error: " << e.what() << std::endl;
 | 
			
		||||
        }
 | 
			
		||||
        quickExit(1);
 | 
			
		||||
        _exit(1);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* Parent. */
 | 
			
		||||
| 
						 | 
				
			
			@ -944,12 +944,6 @@ void closeOnExec(int fd)
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void quickExit(int status)
 | 
			
		||||
{
 | 
			
		||||
    _exit(status);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
void setuidCleanup()
 | 
			
		||||
{
 | 
			
		||||
    /* Don't trust the environment. */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -262,10 +262,6 @@ void closeMostFDs(const set<int> & exceptions);
 | 
			
		|||
/* Set the close-on-exec flag for the given file descriptor. */
 | 
			
		||||
void closeOnExec(int fd);
 | 
			
		||||
 | 
			
		||||
/* Wrapper around _exit() on Unix and ExitProcess() on Windows.  (On
 | 
			
		||||
   Cygwin, _exit() doesn't seem to do the right thing.) */
 | 
			
		||||
void quickExit(int status);
 | 
			
		||||
 | 
			
		||||
/* Common initialisation for setuid programs: clear the environment,
 | 
			
		||||
   sanitize file handles 0, 1 and 2. */
 | 
			
		||||
void setuidCleanup();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue