poldek: poldek/cli/ls.c - sigsegv killed

[mis]

Author: mis                          Date: Mon May 26 08:06:01 2008 GMT
Module: poldek                        Tag: HEAD
---- Log message:
- sigsegv killed

---- Files affected:
poldek/poldek/cli:
   ls.c (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: poldek/poldek/cli/ls.c
diff -u poldek/poldek/cli/ls.c:1.28 poldek/poldek/cli/ls.c:1.29
--- poldek/poldek/cli/ls.c:1.28	Sun May 25 11:25:31 2008
+++ poldek/poldek/cli/ls.c	Mon May 26 10:05:55 2008
@@ -204,14 +204,15 @@
 static tn_array *do_upgradeable(struct cmdctx *cmdctx, tn_array *ls_ents,
                                 tn_array *evrs)
 {
-    int        found, compare_ver = 0, i;
+    int        found, compare_ver = 0, i, lls_mode;
     tn_array   *ls_ents2, *cmpto_pkgs = NULL, *srcpkgs = NULL;
     char       *cmpto_path;
 
     n_assert(cmdctx->_flags & OPT_LS_UPGRADEABLE);
     
+    lls_mode = cmdctx->_flags & OPT_LS_UPGRADEABLE_SEC;
     compare_ver = cmdctx->_flags & OPT_LS_UPGRADEABLE_VER;
-
+    
     cmpto_path = POCLIDEK_INSTALLEDDIR;
     if (cmdctx->_flags & OPT_LS_INSTALLED)
         cmpto_path = POCLIDEK_AVAILDIR;
@@ -250,11 +251,11 @@
         if (!found || cmprc >= 0)
             continue;
 
-        if ((spkg = pkg_srcfilename_s(rpkg))) { 
+        if (lls_mode && (spkg = pkg_srcfilename_s(rpkg))) { 
             if (n_array_bsearch(srcpkgs, spkg)) /* parent included, so me too */
                 found = 1;
             
-        } else if (cmdctx->_flags & OPT_LS_UPGRADEABLE_SEC) {
+        } else if (lls_mode) {
             struct pkg *ipkg, *upkg;
             struct pkguinf *inf;
             
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/cli/ls.c?r1=1.28&r2=1.29&f=u