Imported Debian patch 1.0.2-1debian/1.0.2-1

3 files changed, 18 insertions, 37 deletions

diff --git a/debian/patches/200-dont-delete-htoprc-if-symlink.patch b/debian/patches/200-dont-delete-htoprc-if-symlink.patch
deleted file mode 100644
index 982d87b..0000000
--- a/debian/patches/200-dont-delete-htoprc-if-symlink.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Taken from upstream: http://htop.svn.sourceforge.net/viewvc/htop/trunk/Settings.c?view=patch&r1=286&r2=285&pathrev=286
-
-Don't delete an old .htoprc if it's a symlink.
-
---- trunk/Settings.c	2012/02/17 13:45:58	285
-+++ trunk/Settings.c	2012/03/05 11:12:58	286
-@@ -239,7 +239,9 @@
-       mkdir(htopDir, 0700);
-       free(htopDir);
-       free(configDir);
--      if (access(legacyDotfile, R_OK) != 0) {
-+      struct stat st;
-+      lstat(legacyDotfile, &st);
-+      if (access(legacyDotfile, R_OK) != 0 || S_ISLNK(st.st_mode)) {
-          free(legacyDotfile);
-          legacyDotfile = NULL;
-       }
diff --git a/debian/patches/700-ltrace-support.patch b/debian/patches/700-ltrace-support.patch
index f126e5f..c3695c8 100644
--- a/debian/patches/700-ltrace-support.patch
+++ b/debian/patches/700-ltrace-support.patch
@@ -150,34 +150,31 @@ Index: htop/htop.c
 ===================================================================
 --- htop.orig/htop.c	2011-01-16 17:02:59.000000000 +0200
 +++ htop/htop.c	2011-01-16 18:15:07.000000000 +0200
-@@ -133,6 +133,7 @@
-    mvaddstr(19, 0, "   F2 S: setup                           F6 >: select sort column");
-    mvaddstr(20, 0, "   F1 h: show this help screen              l: list open files with lsof");
-    mvaddstr(21, 0, "  F10 q: quit                               s: trace syscalls with strace");
-+   mvaddstr(22, 0, "                                            L: trace library calls with ltrace");
+@@ -133,6 +133,6 @@
+    mvaddstr(19, 0, "   F2 S: setup                              l: list open files with lsof");
+    mvaddstr(20, 0, "   F1 h: show this help screen              s: trace syscalls with strace");
+-   mvaddstr(21, 0, "  F10 q: quit");
++   mvaddstr(21, 0, "  F10 q: quit                               L: trace library calls with ltrace");
  
     attrset(CRT_colors[HELP_BOLD]);
     mvaddstr( 9, 0, " Arrows"); mvaddstr( 9,40, " F5 t");
-@@ -152,10 +153,11 @@
-    mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, " F6 >");
-    mvaddstr(20, 0, " ? F1 h"); mvaddstr(20,40, "    l");
-    mvaddstr(21, 0, "  F10 q"); mvaddstr(21,40, "    s");
-+   mvaddstr(22,40, "    L");
+@@ -152,6 +152,6 @@
+    mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, "    l");
+    mvaddstr(20, 0, " ? F1 h"); mvaddstr(20,40, "    s");
+-   mvaddstr(21, 0, "  F10 q");
++   mvaddstr(21, 0, "  F10 q"); mvaddstr(21,40, "    L");
     attrset(CRT_colors[DEFAULT_COLOR]);
  
     attrset(CRT_colors[HELP_BOLD]);
--   mvaddstr(23,0, "Press any key to return.");
-+   mvaddstr(24,0, "Press any key to return.");
-    attrset(CRT_colors[DEFAULT_COLOR]);
-    refresh();
-    CRT_readKey();
-@@ -580,9 +582,20 @@
+@@ -580,11 +582,24 @@
           Panel_onKey(panel, KEY_DOWN);
           break;
        }
 +      case 'L':
 +      {
-+         TraceScreen* ts = TraceScreen_new((Process*) Panel_getSelected(panel), LTRACE);
++         Process* p = (Process*) Panel_getSelected(panel);
++         if (!p) break;
++         TraceScreen* ts = TraceScreen_new(p, LTRACE);
 +         TraceScreen_run(ts);
 +         TraceScreen_delete(ts);
 +         clear();
@@ -188,8 +185,10 @@ Index: htop/htop.c
 +      }
        case 's':
        {
--         TraceScreen* ts = TraceScreen_new((Process*) Panel_getSelected(panel));
-+         TraceScreen* ts = TraceScreen_new((Process*) Panel_getSelected(panel), STRACE);
+          Process* p = (Process*) Panel_getSelected(panel);
+          if (!p) break;
+-         TraceScreen* ts = TraceScreen_new(p);
++         TraceScreen* ts = TraceScreen_new(p, STRACE);
           TraceScreen_run(ts);
           TraceScreen_delete(ts);
           clear();
diff --git a/debian/patches/series b/debian/patches/series
index 6c4f8a8..c8aa567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-200-dont-delete-htoprc-if-symlink.patch
 600-openvz-veid-on-kernels-gt-2.6.18.patch 
 700-ltrace-support.patch