From: Roland Häder <roland@mxchange.org>
Date: Fri, 22 Feb 2013 01:33:30 +0000 (+0000)
Subject: Tried to write an hostname extraction methods tries to get rid of comment lines ... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4fb1b3c6ee1bc3a21becc25492da93a88ec464b5;p=core.git

Tried to write an hostname extraction methods tries to get rid of comment lines (#) and key=value pairs as seen on Gentoo Linux
---

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index 43d2503f..cedf677e 100644
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -146,6 +146,52 @@ class ConsoleTools extends BaseFrameworkSystem {
 		return $respArray;
 	}
 
+	/**
+	 * Tried to extract hostname from given raw data. On a Genntoo system, this could be multiple lines with # as comments. So try to get rid of it
+	 *
+	 * @param	$rawData	Raw data from /etc/hostname file
+	 * @return	$hostname	Extracted host name
+	 */
+	protected function extractHostnameFromRawData ($rawData) {
+		// Default is invalid
+		$hostname = 'invalid';
+
+		// Try to "explode" it
+		$data = explode(PHP_EOL, $rawData);
+
+		// "Walk" through it
+		foreach ($data as $line) {
+			// Trim it
+			$line = trim($trim);
+
+			// Begins with a hash (#) = comment?
+			if (substr($line, 0, 1) == '#') {
+				// Then skip it
+				continue;
+			} // END - if
+
+			// Has an equals sign?
+			if (strpos($line, '=') !== FALSE) {
+				// Then "explode" it again, right part is hostname in quotes
+				$hostData = explode('=', $line);
+
+				// Make sure only a key=value pair goes through
+				assert(count($hostData) == 2);
+
+				// Try to get it and abort
+				$hostname = str_replace(array('"', chr(39)), array('', ''), $hostData[1]);
+				break;
+			} else {
+				// Use it directly
+				$hostname = $line;
+				break;
+			}
+		} // END - foreach
+
+		// Return it
+		return $hostname;
+	}
+
 	/**
 	 * Aquires the IP address of this host by reading the /etc/hostname file
 	 * and solving it. It is now stored in configuration
@@ -164,11 +210,14 @@ class ConsoleTools extends BaseFrameworkSystem {
 			$io = FrameworkFileInputPointer::createFrameworkFileInputPointer($helperInstance->getConfigInstance()->getConfigEntry('hostname_file'));
 
 			// Read the file
-			$hostname = trim($io->readFromFile());
+			$rawData = trim($io->readFromFile());
 
 			// Close the file
 			$io->closeFile();
 
+			// Extract hostname from it
+			$hostname = $helperInstance->extractHostnameFromRawData($rawData);
+
 			// Resolve the IP number
 			$ip = $helperInstance->resolveIpAddress($hostname);
 		} catch (FileIoException $e) {