Two fixes by Micah Cowan: make mouse work properly beyond >127 on signed

char architectures and properly parse $TMUX by stopping the socket path
at the first comma.
This commit is contained in:
Nicholas Marriott 2011-03-04 23:26:44 +00:00
parent c36f67a288
commit d5ed5fb08f
2 changed files with 3 additions and 3 deletions

2
tmux.c
View File

@ -132,7 +132,7 @@ parseenvironment(void)
if ((env = getenv("TMUX")) == NULL) if ((env = getenv("TMUX")) == NULL)
return; return;
if (sscanf(env, "%255s,%ld,%d", path, &pid, &idx) != 3) if (sscanf(env, "%255[^,],%ld,%d", path, &pid, &idx) != 3)
return; return;
environ_path = xstrdup(path); environ_path = xstrdup(path);
environ_pid = pid; environ_pid = pid;

View File

@ -630,10 +630,10 @@ tty_keys_mouse(struct tty *tty,
utf8_append(&utf8data, buf[*size]); utf8_append(&utf8data, buf[*size]);
value = utf8_combine(&utf8data); value = utf8_combine(&utf8data);
} else } else
value = buf[*size]; value = (unsigned char)buf[*size];
(*size)++; (*size)++;
} else { } else {
value = buf[*size]; value = (unsigned char)buf[*size];
(*size)++; (*size)++;
} }