| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/libalpm/be_files.c | 36 | ||||
| -rw-r--r-- | lib/libalpm/cache.c | 1 | ||||
| -rw-r--r-- | lib/libalpm/conflict.c | 3 | ||||
| -rw-r--r-- | lib/libalpm/package.c | 17 | ||||
| -rw-r--r-- | lib/libalpm/package.h | 1 | ||||
| -rw-r--r-- | src/pacman/callback.c | 1 | ||||
| -rw-r--r-- | src/pacman/sync.c | 1 |
diff --git a/configure.ac b/configure.ac index 70021730..ff6a0082 100644 --- a/configure.ac +++ b/configure.ac @@ -201,7 +201,7 @@ AM_CONDITIONAL(HAS_DOXYGEN, test "x$usedoxygen" = "xyes") AC_MSG_CHECKING(for debug mode request) if test "x$debug" = "xyes" ; then AC_DEFINE([PACMAN_DEBUG], , [Enable debug code]) - CFLAGS="$CFLAGS -g -Wall -Werror -fstack-protector -std=c99" + CFLAGS="$CFLAGS -g -Wall -Werror -fstack-protector-all -std=c99" LDFLAGS="$LDFLAGS -lmcheck" AC_MSG_RESULT(yes) else diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c index ea00563e..dc89f32f 100644 --- a/lib/libalpm/be_files.c +++ b/lib/libalpm/be_files.c @@ -235,10 +235,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) struct stat buf; char path[PATH_MAX+1]; char line[513]; - /* - alpm_list_t *tmplist; - char *locale; - */ ALPM_LOG_FUNC; @@ -303,32 +299,6 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) if(fgets(info->desc, sizeof(info->desc), fp) == NULL) { goto error; } - /* - while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { - info->desc_localized = alpm_list_add(info->desc_localized, strdup(line)); - PKG_ - } - - if((locale = setlocale(LC_ALL, "")) == NULL) { //To fix segfault when locale invalid - setenv("LC_ALL", "C", 1); - locale = setlocale(LC_ALL, ""); - } - - if(info->desc_localized && !info->desc_localized->next) { - snprintf(info->desc, 512, "%s", (char*)info->desc_localized->data); - } else { - for (tmplist = info->desc_localized; tmplist; tmplist = tmplist->next) { - if (tmplist->data && strncmp(tmplist->data, locale, strlen(locale))) { - strncpy(info->desc, (char *)info->desc_localized->data, sizeof(info->desc)); - } else { - char *p = (char *)tmplist->data; - p += strlen(locale) + 1; - strncpy(info->desc, p, sizeof(info->desc)); - break; - } - } - } - */ _alpm_strtrim(info->desc); } else if(!strcmp(line, "%GROUPS%")) { while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) { @@ -545,12 +515,6 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) fprintf(fp, "%%NAME%%\n%s\n\n" "%%VERSION%%\n%s\n\n", info->name, info->version); if(info->desc[0]) { - /*fputs("%DESC%\n", fp); - for(lp = info->desc_localized; lp; lp = lp->next) { - fprintf(fp, "%s\n", (char *)lp->data); - } - fprintf(fp, "\n"); - */ fprintf(fp, "%%DESC%%\n" "%s\n\n", info->desc); } diff --git a/lib/libalpm/cache.c b/lib/libalpm/cache.c index 4852f0fc..5afff6cc 100644 --- a/lib/libalpm/cache.c +++ b/lib/libalpm/cache.c @@ -26,7 +26,6 @@ #include <stdlib.h> #include <errno.h> #include <string.h> -#include <sys/stat.h> /* libalpm */ #include "cache.h" diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 46d1f227..c7e5eeb4 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -30,9 +30,6 @@ #include <unistd.h> #include <string.h> #include <limits.h> -#if defined(__APPLE__) || defined(__OpenBSD__) -#include <sys/syslimits.h> -#endif #include <sys/stat.h> /* libalpm */ diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d5eca20b..61922e30 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -744,7 +744,6 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) memcpy(newpkg, pkg, sizeof(pmpkg_t)); newpkg->licenses = alpm_list_strdup(alpm_pkg_get_licenses(pkg)); - /*newpkg->desc_localized = alpm_list_strdup(pkg->desc_localized);*/ newpkg->requiredby = alpm_list_strdup(alpm_pkg_get_requiredby(pkg)); newpkg->conflicts = alpm_list_strdup(alpm_pkg_get_conflicts(pkg)); newpkg->files = alpm_list_strdup(alpm_pkg_get_files(pkg)); @@ -768,7 +767,6 @@ void _alpm_pkg_free(pmpkg_t *pkg) } FREELIST(pkg->licenses); - /*FREELIST(pkg->desc_localized);*/ FREELIST(pkg->files); FREELIST(pkg->backup); FREELIST(pkg->depends); @@ -885,22 +883,7 @@ static int parse_descfile(const char *descfile, pmpkg_t *info) } else if(!strcmp(key, "PKGVER")) { strncpy(info->version, ptr, sizeof(info->version)); } else if(!strcmp(key, "PKGDESC")) { - /* - char *lang_tmp; - info->desc_localized = alpm_list_add(info->desc_localized, strdup(ptr)); - if((lang_tmp = malloc(strlen(setlocale(LC_ALL, "")))) == NULL) { - RET_ERR(PM_ERR_MEMORY, -1); - } - strncpy(lang_tmp, setlocale(LC_ALL, ""), strlen(setlocale(LC_ALL, ""))); - if(info->desc_localized && !info->desc_localized->next) { - */ strncpy(info->desc, ptr, sizeof(info->desc)); - /* - } else if (ptr && !strncmp(ptr, lang_tmp, strlen(lang_tmp))) { - strncpy(info->desc, ptr+strlen(lang_tmp)+1, sizeof(info->desc)); - } - FREE(lang_tmp); - */ } else if(!strcmp(key, "GROUP")) { info->groups = alpm_list_add(info->groups, strdup(ptr)); } else if(!strcmp(key, "URL")) { diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index f704ab9c..41ab5f0d 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -67,7 +67,6 @@ struct __pmpkg_t { unsigned short force; time_t date; pmpkgreason_t reason; - /* alpm_list_t *desc_localized;*/ alpm_list_t *licenses; alpm_list_t *replaces; alpm_list_t *groups; diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 0e5d87ee..ef67ab75 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -25,7 +25,6 @@ #include <stdlib.h> #include <string.h> #include <sys/time.h> -#include <sys/stat.h> #include <unistd.h> #include <dirent.h> #include <wchar.h> diff --git a/src/pacman/sync.c b/src/pacman/sync.c index b02ecde1..dab3f595 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -24,7 +24,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/stat.h> #include <unistd.h> #include <dirent.h> |