[Frugalware-git] pacman-g2: _pacman_db_search(): so trivial search if regex not matched

[Miklos Vajna]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b90cb4ed24a8ac1338a26fd40113eb103568f405

commit b90cb4ed24a8ac1338a26fd40113eb103568f405
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date:   Mon Jun 23 03:36:27 2008 +0200

_pacman_db_search(): so trivial search if regex not matched

closes #3133

diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index c8218e8..dcc2d69 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -111,7 +111,7 @@ pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles)

for(j = _pacman_db_get_pkgcache(db); j; j = j->next) {
pmpkg_t *pkg = j->data;
-                       char *haystack;
+                       char *haystack, *ptr;
int match = 0;

/* check name */
@@ -124,6 +124,8 @@ pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles)
} else if(retval) {
_pacman_log(PM_LOG_DEBUG, "    search target '%s' matched '%s'", targ, 
haystack);
match = 1;
+                       } else if (!match && (ptr = strstr(haystack, targ))) {
+                               match = 1;
}
FREE(haystack);

@@ -137,6 +139,8 @@ pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles)
return(NULL);
} else if(retval) {
match = 1;
+                               } else if (!match && (ptr = strstr(haystack, 
targ))) {
+                                       match = 1;
}
FREE(haystack);
}
@@ -152,6 +156,8 @@ pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles)
return(NULL);
} else if(retval) {
match = 1;
+                                       } else if (!match && (ptr = 
strstr(haystack, targ))) {
+                                               match = 1;
}
FREE(haystack);
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git