moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 20:05:07 -05:00
Code Issues Releases Wiki Activity

Clean up query_fileowner

Browse Source 
* gotcha -> found
* line wrap changes

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-05-07 14:21:44 -04:00
parent 01bc7d7749
commit 34ee32d373
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pacman/query.c
View File

@ -76,7 +76,7 @@ static char *resolve_path(const char* file)
static void query_fileowner(pmdb_t *db, char *filename) static void query_fileowner(pmdb_t *db, char *filename)
{ {
struct stat buf; struct stat buf;
int gotcha = 0; int found = 0;
char *rpath; char *rpath;
alpm_list_t *i, *j; alpm_list_t *i, *j;
@ -89,26 +89,26 @@ static void query_fileowner(pmdb_t *db, char *filename)
} }
if(stat(filename, &buf) == -1) { if(stat(filename, &buf) == -1) {
fprintf(stderr, _("error: failed to read file '%s': %s"), fprintf(stderr, _("error: failed to read file '%s': %s\n"),
filename, strerror(errno)); filename, strerror(errno));
return; return;
} }
if(S_ISDIR(buf.st_mode)) { if(S_ISDIR(buf.st_mode)) {
fprintf(stderr, _("error: cannot determine ownership of a directory")); fprintf(stderr, _("error: cannot determine ownership of a directory\n"));
return; return;
} }
if(!(rpath = resolve_path(filename))) { if(!(rpath = resolve_path(filename))) {
fprintf(stderr, _("error: cannot determine real path for '%s': %s"), fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"),
filename, strerror(errno)); filename, strerror(errno));
return; return;
} }
for(i = alpm_db_getpkgcache(db); i && !gotcha; i = alpm_list_next(i)) { for(i = alpm_db_getpkgcache(db); i && !found; i = alpm_list_next(i)) {
pmpkg_t *info = alpm_list_getdata(i); pmpkg_t *info = alpm_list_getdata(i);
for(j = alpm_pkg_get_files(info); j && !gotcha; j = alpm_list_next(j)) { for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) {
char path[PATH_MAX], *ppath; char path[PATH_MAX], *ppath;
snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), (const char *)alpm_list_getdata(j)); snprintf(path, PATH_MAX, "%s%s", alpm_option_get_root(), (const char *)alpm_list_getdata(j));
@ -116,13 +116,13 @@ static void query_fileowner(pmdb_t *db, char *filename)
if(ppath && strcmp(ppath, rpath) == 0) { if(ppath && strcmp(ppath, rpath) == 0) {
printf(_("%s is owned by %s %s\n"), filename, alpm_pkg_get_name(info), alpm_pkg_get_version(info)); printf(_("%s is owned by %s %s\n"), filename, alpm_pkg_get_name(info), alpm_pkg_get_version(info));
gotcha = 1; found = 1;
} }
free(ppath); free(ppath);
} }
} }
if(!gotcha) { if(!found) {
fprintf(stderr, _("error: No package owns %s\n"), filename); fprintf(stderr, _("error: No package owns %s\n"), filename);
} }