Attachment 289893 Details for Bug 426095 – Allow include directive

[patch] Allow include directive

usermode-include.patch (text/plain), 2.16 KB, created by Carlo de Wolf on 2007-12-18 14:46:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlo de Wolf

Created: 2007-12-18 14:46:59 UTC

Size: 2.16 KB

patch

obsolete

>diff --git a/usermode-1.93.1/shvar.c b/usermode-1.93.1/shvar.c
>index 0e00184..eca7d29 100644
>--- a/usermode-1.93.1/shvar.c
>+++ b/usermode-1.93.1/shvar.c
>@@ -35,9 +35,58 @@
> #include <sys/types.h>
> #include <sys/stat.h>
> #include <unistd.h>
>+#include <syslog.h>
>+#include <glib/gi18n.h>
> 
> #include "shvar.h"
> 
>+static gchar *relative_to(const char *name, const char *relativeName) G_GNUC_MALLOC;
>+
>+static gchar *
>+relative_to(const char *name, const char *relativeName)
>+{
>+    gchar *p = g_strrstr(name, "/");
>+    gchar *path, *newName;
>+    if(p == NULL)
>+	return g_strdup(relativeName);
>+    path = g_strndup(name, p - name);
>+    newName = g_strconcat(path, "/", relativeName, NULL);
>+    g_free(path);
>+    return newName;
>+}
>+
>+static gboolean
>+svAppend(shvarFile *s, const gchar *fileName)
>+{
>+    gboolean result;
>+    shvarFile *child;
>+    gchar *newFileName = NULL;
>+
>+    if(fileName[0] != '/') {
>+	fileName = newFileName = relative_to(s->fileName, fileName);
>+    }
>+
>+    child = svNewFile(fileName);
>+    if(child != NULL) {
>+	for(child->current = child->lineList; child->current; child->current = child->current->next) {
>+	    s->lineList = g_list_append(s->lineList, g_strdup(child->current->data));
>+	}
>+	svCloseFile(child);
>+
>+	result = TRUE;
>+    }
>+    else {
>+	syslog(LOG_ERR, _("Can't open file %s\n"), fileName);
>+
>+	result = FALSE;
>+    }
>+
>+    if(newFileName != NULL)
>+	g_free(newFileName);
>+
>+    return result;
>+}
>+
> /* Open the file <name>, returning a shvarFile on success and NULL on failure.
>    Add a wrinkle to let the caller specify whether or not to create the file
>    (actually, return a structure anyway) if it doesn't exist. */
>@@ -68,6 +117,17 @@ svOpenFile(const char *name, gboolean create)
> 
> 	/* we'd use g_strsplit() here, but we want a list, not an array */
> 	for(p = s->arena; (q = strchr(p, '\n')) != NULL; p = q + 1) {
>+	    // TODO: check if there is enough p for the space
>+	    if(p[0] == '.' && p[1] == ' ') {
>+		gchar *fileName = g_strndup(p + 2, q - p - 2);
>+		gboolean result = svAppend(s, fileName);
>+
>+		g_free(fileName);
>+
>+		if(!result)
>+		    goto bail;
>+	    }
>+	    else
> 		s->lineList = g_list_append(s->lineList, g_strndup(p, q - p));
> 	}
>

Actions: View | Diff

Attachments on bug 426095: 289893