1.1 --- a/main.c	Thu Nov 08 22:45:27 2007 -0500
     1.2 +++ b/main.c	Thu Jan 03 19:50:20 2008 -0500
     1.3 @@ -17,9 +17,53 @@
     1.4  command_list(int argc, const char *argv[])
     1.5  {
     1.6  	struct razor_set *set;
     1.7 +	struct razor_package_iterator *pi;
     1.8 +	struct razor_package *package;
     1.9 +	const char *pattern = argv[0], *name, *version;
    1.10  
    1.11  	set = razor_set_open(repo_filename);
    1.12 -	razor_set_list(set, argv[0]);
    1.13 +	pi = razor_package_iterator_create(set);
    1.14 +	while (razor_package_iterator_next(pi, &package, &name, &version)) {
    1.15 +		if (pattern && fnmatch(pattern, name, 0) != 0)
    1.16 +			continue;
    1.17 +
    1.18 +		printf("%s-%s\n", name, version);
    1.19 +	}
    1.20 +	razor_package_iterator_destroy(pi);
    1.21 +	razor_set_destroy(set);
    1.22 +
    1.23 +	return 0;
    1.24 +}
    1.25 +
    1.26 +static int
    1.27 +list_properties(const char *package_name,
    1.28 +		enum razor_property_type required_type)
    1.29 +{
    1.30 +	struct razor_set *set;
    1.31 +	struct razor_property *property;
    1.32 +	struct razor_package *package;
    1.33 +	struct razor_property_iterator *pi;
    1.34 +	const char *name, *version;
    1.35 +	enum razor_property_type type;
    1.36 +
    1.37 +	set = razor_set_open(repo_filename);
    1.38 +	if (package_name)
    1.39 +		package = razor_set_get_package(set, package_name);
    1.40 +	else
    1.41 +		package = NULL;
    1.42 +
    1.43 +	pi = razor_property_iterator_create(set, package);
    1.44 +	while (razor_property_iterator_next(pi, &property,
    1.45 +					    &name, &version, &type)) {
    1.46 +		if (type != required_type)
    1.47 +			continue;
    1.48 +		if (version[0] == '\0')
    1.49 +			printf("%s\n", name);
    1.50 +		else
    1.51 +			printf("%s-%s\n", name, version);
    1.52 +	}
    1.53 +	razor_property_iterator_destroy(pi);
    1.54 +
    1.55  	razor_set_destroy(set);
    1.56  
    1.57  	return 0;
    1.58 @@ -28,49 +72,25 @@
    1.59  static int
    1.60  command_list_requires(int argc, const char *argv[])
    1.61  {
    1.62 -	struct razor_set *set;
    1.63 -
    1.64 -	set = razor_set_open(repo_filename);
    1.65 -	razor_set_list_properties(set, argv[0], RAZOR_PROPERTY_REQUIRES);
    1.66 -	razor_set_destroy(set);
    1.67 -
    1.68 -	return 0;
    1.69 +	return list_properties(argv[0], RAZOR_PROPERTY_REQUIRES);
    1.70  }
    1.71  
    1.72  static int
    1.73  command_list_provides(int argc, const char *argv[])
    1.74  {
    1.75 -	struct razor_set *set;
    1.76 -
    1.77 -	set = razor_set_open(repo_filename);
    1.78 -	razor_set_list_properties(set, argv[0], RAZOR_PROPERTY_PROVIDES);
    1.79 -	razor_set_destroy(set);
    1.80 -
    1.81 -	return 0;
    1.82 +	return list_properties(argv[0], RAZOR_PROPERTY_PROVIDES);
    1.83  }
    1.84  
    1.85  static int
    1.86  command_list_obsoletes(int argc, const char *argv[])
    1.87  {
    1.88 -	struct razor_set *set;
    1.89 -
    1.90 -	set = razor_set_open(repo_filename);
    1.91 -	razor_set_list_properties(set, argv[0], RAZOR_PROPERTY_OBSOLETES);
    1.92 -	razor_set_destroy(set);
    1.93 -
    1.94 -	return 0;
    1.95 +	return list_properties(argv[0], RAZOR_PROPERTY_OBSOLETES);
    1.96  }
    1.97  
    1.98  static int
    1.99  command_list_conflicts(int argc, const char *argv[])
   1.100  {
   1.101 -	struct razor_set *set;
   1.102 -
   1.103 -	set = razor_set_open(repo_filename);
   1.104 -	razor_set_list_properties(set, argv[0], RAZOR_PROPERTY_CONFLICTS);
   1.105 -	razor_set_destroy(set);
   1.106 -
   1.107 -	return 0;
   1.108 +	return list_properties(argv[0], RAZOR_PROPERTY_CONFLICTS);
   1.109  }
   1.110  
   1.111  static int