bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate checking a files existence into a function

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-05-04 13:30:08 +10:00
parent 18ddf90ff4
commit cfd9f1cc69
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/pacman/check.c
View file

@ -26,13 +26,30 @@
#include "conf.h" #include "conf.h"
#include "util.h" #include "util.h"
static int check_file_exists(const char *pkgname, const char * filepath,
struct stat * st)
{
/* use lstat to prevent errors from symlinks */
if(lstat(filepath, st) != 0) {
if(config->quiet) {
printf("%s %s\n", pkgname, filepath);
} else {
pm_printf(ALPM_LOG_WARNING, "%s: %s (%s)\n",
pkgname, filepath, strerror(errno));
}
return 1;
}
return 0;
}
/* Loop through the files of the package to check if they exist. */ /* Loop through the files of the package to check if they exist. */
int check(alpm_pkg_t *pkg) int check(alpm_pkg_t *pkg)
{ {
const char *root, *pkgname; const char *root, *pkgname;
size_t errors = 0; size_t errors = 0;
size_t rootlen; size_t rootlen;
char f[PATH_MAX]; char filepath[PATH_MAX];
alpm_filelist_t *filelist; alpm_filelist_t *filelist;
size_t i; size_t i;
@ -43,7 +60,7 @@ int check(alpm_pkg_t *pkg)
pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, ""); pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, "");
return 1; return 1;
} }
strcpy(f, root); strcpy(filepath, root);
pkgname = alpm_pkg_get_name(pkg); pkgname = alpm_pkg_get_name(pkg);
filelist = alpm_pkg_get_files(pkg); filelist = alpm_pkg_get_files(pkg);
@ -56,17 +73,9 @@ int check(alpm_pkg_t *pkg)
pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path); pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
continue; continue;
} }
strcpy(f + rootlen, path); strcpy(filepath + rootlen, path);
/* use lstat to prevent errors from symlinks */
if(lstat(f, &st) != 0) { errors += check_file_exists(pkgname, filepath, &st);
if(config->quiet) {
printf("%s %s\n", pkgname, f);
} else {
pm_printf(ALPM_LOG_WARNING, "%s: %s (%s)\n",
pkgname, f, strerror(errno));
}
errors++;
}
} }
if(!config->quiet) { if(!config->quiet) {