read product path from the build stamp if possible, default to RedHat if not

available.   basically notting's patch with some fixes and genhdlist handled

1 files changed, 42 insertions, 21 deletions

diff --git a/loader2/loader.c b/loader2/loader.c
index b5aafa4e8..d3086a8ba 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -183,35 +183,56 @@ void stopNewt(void) {
     newtRunning = 0;
 }
 
-char * getProductName(void) {
-    static char * productName = NULL;
+static char * productName = NULL;
+static char * productPath = NULL;
+
+static void initProductInfo(void) {
     FILE *f;
     int i;
 
-    if (!productName) {
-        f = fopen("/.buildstamp", "r");
-        if (!f) {
-            productName = strdup("anaconda");
-        } else {
-            productName = malloc(256);
-            fgets(productName, 256, f); /* stamp time */
-            fgets(productName, 256, f); /* product name */
-
-            i = strlen(productName) - 1;
-            while (isspace(*(productName + i))) {
-                *(productName + i) = '\0';
-                i--;
-            }
-
-            return productName;
-        }
+    f = fopen("/.buildstamp", "r");
+    if (!f) {
+        productName = strdup("anaconda");
+	productPath = strdup("RedHat");
     } else {
-        return productName;
+	productName = malloc(256);
+	productPath = malloc(256);
+        fgets(productName, 256, f); /* stamp time */
+        fgets(productName, 256, f); /* product name */
+	fgets(productPath, 256, f); /* product version */
+	fgets(productPath, 256, f); /* product path */
+
+        i = strlen(productName) - 1;
+	while (isspace(*(productName + i))) {
+            *(productName + i) = '\0';
+            i--;
+        }
+        i = strlen(productPath) - 1;
+	while (isspace(*(productPath + i))) {
+            *(productPath + i) = '\0';
+            i--;
+        }
     }
+}
 
-    return NULL;
+char * getProductName(void) {
+    if (!productName) {
+       initProductInfo();
+    }
+    return productName;
+}
+
+char * getProductPath(void) {
+    if (!productPath) {
+       initProductInfo();
+    }
+    return productPath;
 }
 
+
+
+	
+
 void initializeConsole(moduleList modLoaded, moduleDeps modDeps,
                        moduleInfoSet modInfo, int flags) {
     if (!FL_NOFB(flags))