Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jeffwar/utop
Browse files Browse the repository at this point in the history
  • Loading branch information
bobrippling committed Mar 20, 2012
2 parents f610311 + 87d63ba commit e940c29
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 3 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT/X Consortium License

© 2010-2011 Robert Pilling <robpilling at gmail dot com>

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
7 changes: 5 additions & 2 deletions gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,13 @@ void goto_me(struct proc **procs)

void goto_lock(struct proc **procs)
{
if(lock_proc_pid == -1)
if(lock_proc_pid == -1){
attron( COLOR_PAIR(1 + COLOR_RED));
WAIT_STATUS("no process locked on");
else
attroff(COLOR_PAIR(1 + COLOR_RED));
}else{
goto_proc(procs, proc_get(procs, lock_proc_pid));
}
}

void showproc(struct proc *proc, int *py, int indent)
Expand Down
4 changes: 3 additions & 1 deletion proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ static void proc_handle_rename(struct proc *this)
this->argv[argc] = NULL;

free(this->cmd);
this->cmd = buffer;
this->cmd = buffer;
}else{
this->cmd = ustrdup("");
}
}

Expand Down

0 comments on commit e940c29

Please sign in to comment.