- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-28-ga33424f
by dan＠archlinux.org 14 Oct '11

14 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via a33424f87955c43652a61fcef5817df07e17bee3 (commit) via 020bdb4298cd1bc53df7ca4d911cda7aaa65329c (commit) via dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9 (commit) via 0d2600c575033774485f84ad67cbc602592237ab (commit) via 185cbb8a44d9e084580d6a9f4ca004c20ee90103 (commit) via 8605284e0d1b70d9845ca4c6362d7d451f503d32 (commit) via 9934052b54fd4dcd2339a2beb87ccc81b5e144bd (commit) via 5b5b250443ed416a2c2315c28a034501603cd003 (commit) via 86bc36412e2619e0e05d61cf6216ef68814cf1cd (commit) via 1ebe5dc1979e90c37d6534d6b1e0173a884326b1 (commit) via 43cad9c871f32da7a5342ba8b68aa316d7e47e9e (commit) from 53e525c4f3a6b0bfdc346b4563c6c8fc0e1b5b11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a33424f87955c43652a61fcef5817df07e17bee3 Merge: dbd54c0 020bdb4 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 14 08:16:18 2011 -0500 Merge branch 'maint' commit dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 12:34:58 2011 -0500 Use fputs and putchar in callback progress display When we have fixed strings or output, printf overhead is unnecessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d2600c575033774485f84ad67cbc602592237ab Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 11 12:35:33 2011 -0500 Remove -f short option for --force This is not something that should be used on a frequent basis, and giving it a short option encourages use without making the drawbacks obvious. For the 1% of situations that require it, the 5 extra keystrokes are a fair price to pay. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8605284e0d1b70d9845ca4c6362d7d451f503d32 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 3 10:54:08 2011 -0500 Use puts() instead of no-op printf() where applicable This replaces several printf calls of the following styles: printf("%s", ...); printf("some fixed string"); printf("x"); We can use either fputs() or putchar() here to do the same thing without incurring the overhead of the printf format parser. The biggest gain here comes when we are calling the print function in a loop repeatedly; notably when printing local package files. $ /usr/bin/time ./pacman-before -Ql | md5sum 0.25user 0.04system 0:00.30elapsed 98%CPU $ /usr/bin/time ./pacman-after -Ql | md5sum 0.17user 0.06system 0:00.25elapsed 94%CPU $ /usr/bin/time ./pacman-before -Qlq | md5sum 0.20user 0.05system 0:00.26elapsed 98%CPU $ /usr/bin/time ./pacman-after -Qlq | md5sum 0.15user 0.05system 0:00.23elapsed 93%CPU So '-Ql' shows a 17% improvement while '-Qlq' shows a 13% improvement on 382456 total files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9934052b54fd4dcd2339a2beb87ccc81b5e144bd Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 18:03:10 2011 -0500 Remove mcheck.h support When was the last time anyone used this? That's what I thought. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 - contrib/bash_completion.in | 4 +- contrib/zsh_completion.in | 4 +- doc/.gitignore | 4 +- doc/Makefile.am | 12 ++-- doc/asciidoc-override.css | 7 ++ doc/index.txt | 135 +++++++++++++++++++++++++++------------ doc/pacman.8.txt | 2 +- lib/libalpm/dload.c | 24 ++++--- lib/libalpm/dload.h | 2 + scripts/makepkg.sh.in | 20 +++--- src/pacman/callback.c | 34 +++++----- src/pacman/conf.h | 3 +- src/pacman/package.c | 15 +++-- src/pacman/pacman.c | 16 +---- src/pacman/query.c | 10 ++-- src/pacman/sync.c | 10 ++-- src/pacman/util.c | 18 +++--- test/pacman/tests/upgrade012.py | 2 +- test/pacman/tests/upgrade014.py | 2 +- test/pacman/tests/upgrade015.py | 2 +- test/pacman/tests/upgrade016.py | 2 +- test/pacman/tests/upgrade046.py | 2 +- 23 files changed, 198 insertions(+), 134 deletions(-) create mode 100644 doc/asciidoc-override.css hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-12-g020bdb4
by dan＠archlinux.org 14 Oct '11

14 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 020bdb4298cd1bc53df7ca4d911cda7aaa65329c (commit) via 185cbb8a44d9e084580d6a9f4ca004c20ee90103 (commit) via 5b5b250443ed416a2c2315c28a034501603cd003 (commit) via 86bc36412e2619e0e05d61cf6216ef68814cf1cd (commit) via 1ebe5dc1979e90c37d6534d6b1e0173a884326b1 (commit) via 43cad9c871f32da7a5342ba8b68aa316d7e47e9e (commit) from 04fd320e97770911894fb06ba98f3c17fc30c7d9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 020bdb4298cd1bc53df7ca4d911cda7aaa65329c Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 17:26:17 2011 -0500 makepkg: don't attach traps until after argument parsing Nothing we do in our traps is necessary this early in the script. This fixes FS#26196. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 185cbb8a44d9e084580d6a9f4ca004c20ee90103 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 14 07:38:58 2011 -0500 Add missing #ifdef around cURL error code in download struct Thanks to Eduardo Tongson on the mailing list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5b5b250443ed416a2c2315c28a034501603cd003 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 12:30:31 2011 -0500 Coding style cleanups Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86bc36412e2619e0e05d61cf6216ef68814cf1cd Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 12:53:56 2011 -0500 curl_gethost() potential bug fixups This is in the realm of "probably not going to happen", but if someone were to translate "disk" to a string longer than 256 characters, we would have a smashed/corrupted stack due to our unchecked strcpy() call. Rework the function to always length-check the value we copy into the hostname buffer, and do it with memcpy rather than the more cumbersome and unnecessary snprintf. Finally, move the magic 256 value into a constant and pass it into the function which is going to get inlined anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1ebe5dc1979e90c37d6534d6b1e0173a884326b1 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 14:54:49 2011 -0500 doc/index.txt: Reformat past releases chart This makes it a three-column deal with releases all the way back to 1.0. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 43cad9c871f32da7a5342ba8b68aa316d7e47e9e Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 14:49:48 2011 -0500 doc: update .gitignore, add CSS override for new tables usage * Make all docs depend on Makefile; if we change flags here we want them rebuilt. * Add explicit filenames to .gitignore so we can add our own CSS override file, and add an asciidoc-override.css resource. * Adjust a few asciidoc options when generating HTML. * Remove asciidoc-manpage.css; apparantly this doesn't exist anymore. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 4 +- doc/Makefile.am | 12 ++-- doc/asciidoc-override.css | 7 ++ doc/index.txt | 135 +++++++++++++++++++++++++++++++-------------- lib/libalpm/dload.c | 24 +++++--- lib/libalpm/dload.h | 2 + scripts/makepkg.sh.in | 20 +++---- src/pacman/util.c | 10 ++-- 8 files changed, 141 insertions(+), 73 deletions(-) create mode 100644 doc/asciidoc-override.css hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Missing ifdef
by Eduardo Tongson 14 Oct '11

14 Oct '11

Thanks! - e

2 1

[pacman-dev] [PATCH] Use puts() instead of no-op printf() where applicable
by Dan McGee 14 Oct '11

14 Oct '11

This replaces several printf calls of the following styles: printf("%s", ...); printf("some fixed string"); printf("x"); We can use either fputs() or putchar() here to do the same thing without incurring the overhead of the printf format parser. The biggest gain here comes when we are calling the print function in a loop repeatedly; notably when printing local package files. $ /usr/bin/time ./pacman-before -Ql | md5sum 0.25user 0.04system 0:00.30elapsed 98%CPU $ /usr/bin/time ./pacman-after -Ql | md5sum 0.17user 0.06system 0:00.25elapsed 94%CPU $ /usr/bin/time ./pacman-before -Qlq | md5sum 0.20user 0.05system 0:00.26elapsed 98%CPU $ /usr/bin/time ./pacman-after -Qlq | md5sum 0.15user 0.05system 0:00.23elapsed 93%CPU So '-Ql' shows a 17% improvement while '-Qlq' shows a 13% improvement on 382456 total files. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/callback.c | 4 ++-- src/pacman/package.c | 15 ++++++++++----- src/pacman/pacman.c | 2 +- src/pacman/query.c | 10 +++++----- src/pacman/sync.c | 10 +++++----- src/pacman/util.c | 8 ++++---- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 7235d39..80db402 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -228,7 +228,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2) printf(_("failed.\n")); break; case ALPM_EVENT_SCRIPTLET_INFO: - printf("%s", (char *)data1); + fputs((const char *)data1, stdout); break; case ALPM_EVENT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char *)data1); @@ -495,7 +495,7 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, alpm_list_t *i = NULL; on_progress = 0; for(i = output; i; i = i->next) { - printf("%s", (char *)i->data); + fputs((const char *)i->data, stdout); } fflush(stdout); FREELIST(output); diff --git a/src/pacman/package.c b/src/pacman/package.c index 4950957..f82be47 100644 --- a/src/pacman/package.c +++ b/src/pacman/package.c @@ -252,11 +252,16 @@ void dump_pkg_files(alpm_pkg_t *pkg, int quiet) for(i = 0; i < pkgfiles->count; i++) { const alpm_file_t *file = pkgfiles->files + i; + /* Regular: '<pkgname> <root><filepath>\n' + * Quiet : '<root><filepath>\n' + */ if(!quiet) { - fprintf(stdout, "%s %s%s\n", pkgname, root, file->name); - } else { - fprintf(stdout, "%s%s\n", root, file->name); + fputs(pkgname, stdout); + putchar(' '); } + fputs(root, stdout); + fputs(file->name, stdout); + putchar('\n'); } fflush(stdout); @@ -281,10 +286,10 @@ void dump_pkg_changelog(alpm_pkg_t *pkg) /* if we hit the end of the file, we need to add a null terminator */ *(buf + ret) = '\0'; } - printf("%s", buf); + fputs(buf, stdout); } alpm_pkg_changelog_close(pkg, fp); - printf("\n"); + putchar('\n'); } } diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 5ebced2..ac793df 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -208,7 +208,7 @@ static void usage(int op, const char * const myname) } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for (i = list; i; i = alpm_list_next(i)) { - printf("%s", (const char *)i->data); + fputs((const char *)i->data, stdout); } alpm_list_free(list); #undef addlist diff --git a/src/pacman/query.c b/src/pacman/query.c index dbea966..f3df923 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -268,23 +268,23 @@ static int query_search(alpm_list_t *targets) if(!config->quiet) { printf("local/%s %s", alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { - printf("%s", alpm_pkg_get_name(pkg)); + fputs(alpm_pkg_get_name(pkg), stdout); } if(!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - printf(" ("); + fputs(" (", stdout); for(k = grp; k; k = alpm_list_next(k)) { const char *group = k->data; - printf("%s", group); + fputs(group, stdout); if(alpm_list_next(k)) { /* only print a spacer if there are more groups */ - printf(" "); + putchar(' '); } } - printf(")"); + putchar(')'); } /* we need a newline and initial indent first */ diff --git a/src/pacman/sync.c b/src/pacman/sync.c index dd8eb74..925257e 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -359,22 +359,22 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf("%s/%s %s", alpm_db_get_name(db), alpm_pkg_get_name(pkg), alpm_pkg_get_version(pkg)); } else { - printf("%s", alpm_pkg_get_name(pkg)); + fputs(alpm_pkg_get_name(pkg), stdout); } if(!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; - printf(" ("); + fputs(" (", stdout); for(k = grp; k; k = alpm_list_next(k)) { const char *group = k->data; - printf("%s", group); + fputs(group, stdout); if(alpm_list_next(k)) { /* only print a spacer if there are more groups */ - printf(" "); + putchar(' '); } } - printf(")"); + putchar(')'); } print_installed(db_local, pkg); diff --git a/src/pacman/util.c b/src/pacman/util.c index 278b65c..2696451 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -266,7 +266,7 @@ void indentprint(const char *str, size_t indent) /* if we're not a tty, or our tty is not wide enough that wrapping even makes * sense, print without indenting */ if(cols == 0 || indent > cols) { - printf("%s", str); + fputs(str, stdout); return; } @@ -623,7 +623,7 @@ void list_display(const char *title, const alpm_list_t *list) const unsigned short maxcols = getcols(); size_t cols = len; const char *str = list->data; - printf("%s", str); + fputs(str, stdout); cols += string_length(str); for(i = alpm_list_next(list); i; i = alpm_list_next(i)) { str = i->data; @@ -641,10 +641,10 @@ void list_display(const char *title, const alpm_list_t *list) printf(" "); cols += 2; } - printf("%s", str); + fputs(str, stdout); cols += s; } - printf("\n"); + putchar('\n'); } } -- 1.7.7

1 0

[pacman-dev] [PATCH] curl_gethost() potential bug fixups
by Dan McGee 14 Oct '11

14 Oct '11

This is in the realm of "probably not going to happen", but if someone were to translate "disk" to a string longer than 256 characters, we would have a smashed/corrupted stack due to our unchecked strcpy() call. Rework the function to always length-check the value we copy into the hostname buffer, and do it with memcpy rather than the more cumbersome and unnecessary snprintf. Finally, move the magic 256 value into a constant and pass it into the function which is going to get inlined anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 83060f9..cd2857c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -127,13 +127,14 @@ static int curl_progress(void *file, double dltotal, double dlnow, return 0; } -static int curl_gethost(const char *url, char *buffer) +static int curl_gethost(const char *url, char *buffer, size_t buf_len) { size_t hostlen; char *p, *q; if(strncmp(url, "file://", 7) == 0) { - strcpy(buffer, _("disk")); + p = _("disk"); + hostlen = strlen(p); } else { p = strstr(url, "//"); if(!p) { @@ -154,13 +155,14 @@ static int curl_gethost(const char *url, char *buffer) hostlen -= q - p + 1; p = q + 1; } + } - if(hostlen > 255) { - /* buffer overflow imminent */ - return 1; - } - snprintf(buffer, hostlen + 1, "%s", p); + if(hostlen > buf_len - 1) { + /* buffer overflow imminent */ + return 1; } + memcpy(buffer, p, hostlen); + buffer[hostlen] = '\0'; return 0; } @@ -310,14 +312,16 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat return fp; } +/* RFC1123 states applications should support this length */ +#define HOSTNAME_SIZE 256 + static int curl_download_internal(struct dload_payload *payload, const char *localpath, char **final_file) { int ret = -1; FILE *localf = NULL; char *effective_url; - /* RFC1123 states applications should support this length */ - char hostname[256]; + char hostname[HOSTNAME_SIZE]; char error_buffer[CURL_ERROR_SIZE] = {0}; struct stat st; long timecond, respcode = 0, remote_time = -1; @@ -332,7 +336,7 @@ static int curl_download_internal(struct dload_payload *payload, if(!payload->remote_name) { payload->remote_name = strdup(get_filename(payload->fileurl)); } - if(!payload->remote_name || curl_gethost(payload->fileurl, hostname) != 0) { + if(!payload->remote_name || curl_gethost(payload->fileurl, hostname, sizeof(hostname)) != 0) { _alpm_log(handle, ALPM_LOG_ERROR, _("url '%s' is invalid\n"), payload->fileurl); RET_ERR(handle, ALPM_ERR_SERVER_BAD_URL, -1); } -- 1.7.7

2 1

[pacman-dev] [PATCH] Remove mcheck.h support
by Dan McGee 13 Oct '11

13 Oct '11

When was the last time anyone used this? That's what I thought. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 2 -- src/pacman/pacman.c | 8 -------- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index a5a5bba..c23da75 100644 --- a/configure.ac +++ b/configure.ac @@ -295,8 +295,6 @@ AC_MSG_CHECKING(for debug mode request) if test "x$debug" = "xyes" ; then AC_MSG_RESULT(yes) AC_DEFINE([PACMAN_DEBUG], , [Enable debug code]) - # Check for mcheck - AC_CHECK_HEADERS([mcheck.h]) # Check for -fstack-protector availability GCC_STACK_PROTECT_LIB GCC_STACK_PROTECT_CC diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index d14b887..5ebced2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -39,9 +39,6 @@ #include <sys/utsname.h> /* uname */ #include <locale.h> /* setlocale */ #include <errno.h> -#if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) -#include <mcheck.h> /* debug tracing (mtrace) */ -#endif /* alpm */ #include <alpm.h> @@ -769,11 +766,6 @@ int main(int argc, char *argv[]) uid_t myuid = geteuid(); #endif -#if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H) - /*setenv("MALLOC_TRACE","pacman.mtrace", 0);*/ - mtrace(); -#endif - /* Set signal handlers */ /* Set up the structure to specify the new action. */ new_action.sa_handler = handler; -- 1.7.7

1 0

[pacman-dev] [PATCH] makepkg: don't attach traps until after argument parsing
by Dan McGee 13 Oct '11

13 Oct '11

Nothing we do in our traps is necessary this early in the script. This fixes FS#26196. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/makepkg.sh.in | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 09c1e96..3085bf5 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -174,17 +174,6 @@ clean_up() { } -## -# Signal Traps -## -set -E -trap 'clean_up' 0 -for signal in TERM HUP QUIT; do - trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" -done -trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT -trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR - enter_fakeroot() { msg "$(gettext "Entering %s environment...")" "fakeroot" @@ -1956,6 +1945,15 @@ while true; do shift done +# setup signal traps +trap 'clean_up' 0 +for signal in TERM HUP QUIT; do + trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" +done +trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT +trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR +set -E + # preserve environment variables and canonicalize path [[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) [[ -n ${SRCDEST} ]] && _SRCDEST=$(canonicalize_path ${SRCDEST}) -- 1.7.7

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-17-g53e525c
by dan＠archlinux.org 13 Oct '11

13 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 53e525c4f3a6b0bfdc346b4563c6c8fc0e1b5b11 (commit) from ff8704635440fe890ac8621722cc8301a3875e48 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 53e525c4f3a6b0bfdc346b4563c6c8fc0e1b5b11 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 13 16:25:21 2011 -0500 Fix some strict 32-bit gcc warnings Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/util.c | 4 +++- src/pacman/callback.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] doc: update .gitignore, add CSS override for new tables usage
by Dan McGee 13 Oct '11

13 Oct '11

* Make all docs depend on Makefile; if we change flags here we want them rebuilt. * Add explicit filenames to .gitignore so we can add our own CSS override file, and add an asciidoc-override.css resource. * Adjust a few asciidoc options when generating HTML. * Remove asciidoc-manpage.css; apparantly this doesn't exist anymore. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- doc/.gitignore | 4 +++- doc/Makefile.am | 12 +++++++----- doc/asciidoc-override.css | 7 +++++++ 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 doc/asciidoc-override.css diff --git a/doc/.gitignore b/doc/.gitignore index a7f33e5..5625735 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -9,7 +9,9 @@ pkgdelta.8 repo-add.8 repo-remove.8 vercmp.8 -*.css +asciidoc-manpage.css +asciidoc.css +asciidoc.js *.html *.xml man3 diff --git a/doc/Makefile.am b/doc/Makefile.am index aa27b50..f449e72 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -41,6 +41,7 @@ HTML_DOCS = \ EXTRA_DIST = \ asciidoc.conf \ + asciidoc-override.css \ pacman.8.txt \ makepkg.8.txt \ repo-add.8.txt \ @@ -91,8 +92,9 @@ html: $(HTML_DOCS) website: html bsdtar czf website.tar.gz $(HTML_DOCS) \ + asciidoc-override.css \ -C /etc/asciidoc/stylesheets/ \ - asciidoc.css asciidoc-manpage.css \ + asciidoc.css \ -C /etc/asciidoc/javascripts/ \ asciidoc.js \ -C /etc/asciidoc/ \ @@ -116,7 +118,7 @@ A2X_OPTS = \ --destination-dir='./' # These rules are due to the includes and files of the asciidoc text -$(ASCIIDOC_MANS): asciidoc.conf footer.txt +$(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt @@ -128,9 +130,9 @@ HACKING.html: ../HACKING dos2unix $@ # Customizations for certain HTML docs -$(HTML_MANPAGES): asciidoc.conf footer.txt -$(HTML_OTHER): asciidoc.conf -%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons +$(HTML_MANPAGES): asciidoc.conf footer.txt Makefile +$(HTML_OTHER): asciidoc.conf Makefile +%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css %.8.html: ASCIIDOC_OPTS += -d manpage %.5.html: ASCIIDOC_OPTS += -d manpage %.3.html: ASCIIDOC_OPTS += -d manpage diff --git a/doc/asciidoc-override.css b/doc/asciidoc-override.css new file mode 100644 index 0000000..328c8fc --- /dev/null +++ b/doc/asciidoc-override.css @@ -0,0 +1,7 @@ +table th, table td { + padding: 0.2em 1em; +} + +table td p.table { + margin: 0; +} -- 1.7.7

1 1

[pacman-dev] [PATCH] lib/util: call malloc from MALLOC, not calloc
by Dave Reisner 13 Oct '11

13 Oct '11

This was added in cc754bc6 as a "safety" measure, but sort of defeats the purpose of having this macro. If we're using malloc unsafely, then we've already lost. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/util.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/util.h b/lib/libalpm/util.h index 2a2d3a9..86aa7f2 100644 --- a/lib/libalpm/util.h +++ b/lib/libalpm/util.h @@ -51,7 +51,7 @@ #define ALLOC_FAIL(s) do { fprintf(stderr, "alloc failure: could not allocate %zd bytes\n", s); } while(0) -#define MALLOC(p, s, action) do { p = calloc(1, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) +#define MALLOC(p, s, action) do { p = malloc(s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) #define CALLOC(p, l, s, action) do { p = calloc(l, s); if(p == NULL) { ALLOC_FAIL(s); action; } } while(0) /* This strdup macro is NULL safe- copying NULL will yield NULL */ #define STRDUP(r, s, action) do { if(s != NULL) { r = strdup(s); if(r == NULL) { ALLOC_FAIL(strlen(s)); action; } } else { r = NULL; } } while(0) -- 1.7.7

1 0