Attachment 148178 Details for Bug 228720 – Patch that resolves wrong TERM setting

[patch] Patch that resolves wrong TERM setting

replace-env-bz228720.patch (text/plain), 1.04 KB, created by Joachim Frieben on 2007-02-16 09:25:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joachim Frieben

Created: 2007-02-16 09:25:19 UTC

Size: 1.04 KB

patch

obsolete

>--- src/pty.c.replace-env-bz228720
>+++ src/pty.c
>@@ -277,7 +277,7 @@
> 
> 	if (command != NULL) {
> 		gchar **arg2, **envp2;
>-		gint i, k, argc;
>+		gint i, j, k, argc;
> 
> 		/* push the command into argv[0] */
> 		argc = argv ? g_strv_length (argv) : 0;
>@@ -296,7 +296,34 @@
> 		}
> 		if (envp != NULL) {
> 			for (k = 0; envp[k] != NULL; k++) {
>-				envp2[i++] = g_strdup (envp[k]);
>+				const char *ek = strchr (envp[k], '=');
>+				gint lk;
>+				if (ek) {
>+					lk = ek - envp[k];
>+				} else {
>+					lk = strlen (envp[k]);
>+				}
>+				/* ensure we replace env.vars
>+				 * with the application values */
>+				for (j = 0; j < i; j++) {
>+					const char *ej = strchr (envp2[j], '=');
>+					gint lj;
>+					if (ej) {
>+						lj = ej - envp2[j];
>+					} else {
>+						lj = strlen (envp2[j]);
>+					}
>+					if (lk == lj &&
>+							strncmp (envp[k], envp2[j], lk) == 0) {
>+						break;
>+					}
>+				}
>+				if (j == i) {
>+					envp2[i++] = g_strdup (envp[k]);
>+				} else {
>+					g_free (envp2[j]);
>+					envp2[j] = g_strdup (envp[k]);
>+				}
> 			}
> 		}
> 		envp2[i] = NULL;

Actions: View | Diff

Attachments on bug 228720: 148178 | 148189