circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Return -1 not NULL on error. Doh.

pull/1/head
Nicholas Marriott 2009-02-09 18:09:58 +00:00
parent c9cfc9a9f3
commit 1b036c1ca9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osdep-darwin.c
View File

@ -1,4 +1,4 @@
/* $Id: osdep-darwin.c,v 1.5 2009-02-09 18:08:01 nicm Exp $ */
/* $Id: osdep-darwin.c,v 1.6 2009-02-09 18:09:58 nicm Exp $ */
/*
* Copyright (c) 2009 Joshua Elsasser <josh@elsasser.org>
@ -43,12 +43,12 @@ osdep_get_name(int fd, unused char *tty, unused pid_t *last_pid, char **name)
struct kinfo_proc kp;
if ((mib[3] = tcgetpgrp(fd)) == -1)
return (NULL);
return (-1);
size = sizeof kp;
if (sysctl(mib, 4, &kp, &size, NULL, 0) == -1 ||
kp.kp_proc.p_comm[0] == '\0')
return (NULL);
return (-1);
return (strdup(kp.kp_proc.p_comm));
}

12
osdep-freebsd.c
View File

@ -1,4 +1,4 @@
/* $Id: osdep-freebsd.c,v 1.12 2009-02-09 18:08:01 nicm Exp $ */
/* $Id: osdep-freebsd.c,v 1.13 2009-02-09 18:09:58 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -55,18 +55,18 @@ osdep_get_name(int fd, char *tty, pid_t *last_pid, char **name)
buf = NULL;
if (stat(tty, &sb) == -1)
return (NULL);
return (-1);
if ((mib[3] = tcgetpgrp(fd)) == -1)
return (NULL);
return (-1);
retry:
if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) == -1)
return (NULL);
return (-1);
len = (len * 5) / 4;
if ((newbuf = realloc(buf, len)) == NULL) {
free(buf);
return (NULL);
return (-1);
}
buf = newbuf;
@ -74,7 +74,7 @@ retry:
if (errno == ENOMEM)
goto retry;
free(buf);
return (NULL);
return (-1);
}
bestp = NULL;