Home Explore Help
Register Sign In
ldpinney
/
GnuBee-libreCMC
forked from libreCMC/libreCMC
2
0
Fork 2
Files
Tree: 92a7239b36
Branches Tags
GnuBee-libreCMC
/
package
/
system
/
opkg
/
patches
/
060-add-find-command.patch

060-add-find-command.patch 2.3 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758 
  1. --- a/libopkg/opkg_cmd.c
    2. 

  2. +++ b/libopkg/opkg_cmd.c
    3. 

  3. @@ -594,7 +594,7 @@ opkg_download_cmd(int argc, char **argv)
    4. 

  4.  
    5. 

  5.  
    6. 

  6.  static int
    7. 

  7. -opkg_list_cmd(int argc, char **argv)
    8. 

  8. +opkg_list_find_cmd(int argc, char **argv, int use_desc)
    9. 

  9.  {
    10. 

  10.       int i;
    11. 

  11.       pkg_vec_t *available;
    12. 

  12. @@ -610,7 +610,8 @@ opkg_list_cmd(int argc, char **argv)
    13. 

  13.       for (i=0; i < available->len; i++) {
    14. 

  14.  	  pkg = available->pkgs[i];
    15. 

  15.  	  /* if we have package name or pattern and pkg does not match, then skip it */
    16. 

  16. -	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase))
    17. 

  17. +	  if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase) &&
    18. 

  18. +	      (!use_desc || !pkg->description || fnmatch(pkg_name, pkg->description, conf->nocase)))
    19. 

  19.  	       continue;
    20. 

  20.            print_pkg(pkg);
    21. 

  21.       }
    22. 

  22. @@ -619,6 +620,18 @@ opkg_list_cmd(int argc, char **argv)
    23. 

  23.       return 0;
    24. 

  24.  }
    25. 

  25.  
    26. 

  26. +static int
    27. 

  27. +opkg_list_cmd(int argc, char **argv)
    28. 

  28. +{
    29. 

  29. +	return opkg_list_find_cmd(argc, argv, 0);
    30. 

  30. +}
    31. 

  31. +
    32. 

  32. +static int
    33. 

  33. +opkg_find_cmd(int argc, char **argv)
    34. 

  34. +{
    35. 

  35. +	return opkg_list_find_cmd(argc, argv, 1);
    36. 

  36. +}
    37. 

  37. +
    38. 

  38.  
    39. 

  39.  static int
    40. 

  40.  opkg_list_installed_cmd(int argc, char **argv)
    41. 

  41. @@ -1262,6 +1275,7 @@ static opkg_cmd_t cmds[] = {
    42. 

  42.       {"configure", 0, (opkg_cmd_fun_t)opkg_configure_cmd, PFM_DESCRIPTION|PFM_SOURCE},
    43. 

  43.       {"files", 1, (opkg_cmd_fun_t)opkg_files_cmd, PFM_DESCRIPTION|PFM_SOURCE},
    44. 

  44.       {"search", 1, (opkg_cmd_fun_t)opkg_search_cmd, PFM_DESCRIPTION|PFM_SOURCE},
    45. 

  45. +     {"find", 1, (opkg_cmd_fun_t)opkg_find_cmd, PFM_SOURCE},
    46. 

  46.       {"download", 1, (opkg_cmd_fun_t)opkg_download_cmd, PFM_DESCRIPTION|PFM_SOURCE},
    47. 

  47.       {"compare_versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd, PFM_DESCRIPTION|PFM_SOURCE},
    48. 

  48.       {"compare-versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd, PFM_DESCRIPTION|PFM_SOURCE},
    49. 

  49. --- a/src/opkg-cl.c
    50. 

  50. +++ b/src/opkg-cl.c
    51. 

  51. @@ -246,6 +246,7 @@ usage()
    52. 

  52.  	printf("\tlist-changed-conffiles	List user modified configuration files\n");
    53. 

  53.  	printf("\tfiles <pkg>		List files belonging to <pkg>\n");
    54. 

  54.  	printf("\tsearch <file|regexp>	List package providing <file>\n");
    55. 

  55. +	printf("\tfind <regexp>		List packages whose name or description matches <regexp>\n");
    56. 

  56.  	printf("\tinfo [pkg|regexp]	Display all info for <pkg>\n");
    57. 

  57.  	printf("\tstatus [pkg|regexp]	Display all status for <pkg>\n");
    58. 

  58.  	printf("\tdownload <pkg>		Download <pkg> to current directory\n");
    59.