From 83bc374960ab86911bb8d05d521ac94746c719ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=E7i?= Date: Tue, 5 May 2009 23:40:15 +0000 Subject: Move exec_command function to util.inc. --- etc/inc/pfsense-utils.inc | 16 ---------------- etc/inc/util.inc | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 753ba8e..af90190 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -588,22 +588,6 @@ function find_virtual_ip_netmask($ip) { } } -/****f* pfsense-utils/exec_command - * NAME - * exec_command - Execute a command and return a string of the result. - * INPUTS - * $command - String of the command to be executed. - * RESULT - * String containing the command's result. - * NOTES - * This function returns the command's stdout and stderr. - ******/ -function exec_command($command) { - $output = array(); - exec($command . ' 2>&1 ', $output); - return(implode("\n", $output)); -} - /* * convert_ip_to_network_format($ip, $subnet): converts an ip address to network form diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 2be1f39..b129824 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -490,6 +490,22 @@ function log_error($error) { return; } +/****f* util/exec_command + * NAME + * exec_command - Execute a command and return a string of the result. + * INPUTS + * $command - String of the command to be executed. + * RESULT + * String containing the command's result. + * NOTES + * This function returns the command's stdout and stderr. + ******/ +function exec_command($command) { + $output = array(); + exec($command . ' 2>&1 ', $output); + return(implode("\n", $output)); +} + /* wrapper for exec() */ function mwexec($command, $mute = false) { -- cgit v1.1