diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-10-25 11:37:29 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-10-25 11:37:29 +0800 |
commit | e934b106497f17545e236bb9644bed935cd118ad (patch) | |
tree | 29839e0cbcfadbf35eac8fc26b9ad2afe1301370 /textproc/scrollkeeper/files/patch-libs_i18n.c | |
parent | 14c9f603eb5d9868d374e46ac865925da109a838 (diff) | |
download | marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.gz marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.bz2 marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.lz marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.xz marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.tar.zst marcuscom-ports-e934b106497f17545e236bb9644bed935cd118ad.zip |
Remove these now that they have been committed to the FreeBSD ports tree.
Next stop GNOME 2.21.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9875 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'textproc/scrollkeeper/files/patch-libs_i18n.c')
-rw-r--r-- | textproc/scrollkeeper/files/patch-libs_i18n.c | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/textproc/scrollkeeper/files/patch-libs_i18n.c b/textproc/scrollkeeper/files/patch-libs_i18n.c deleted file mode 100644 index 3e5f38730..000000000 --- a/textproc/scrollkeeper/files/patch-libs_i18n.c +++ /dev/null @@ -1,60 +0,0 @@ ---- libs/i18n.c.orig Sun Nov 9 18:05:36 2003 -+++ libs/i18n.c Tue Feb 14 18:50:23 2006 -@@ -38,6 +38,19 @@ enum { - * All rights reserved. - */ - -+/* XXX Implement strndup for FreeBSD. */ -+static char * -+strndup(const char *str, size_t len) { -+ char *ret; -+ -+ if ((str == NULL || len < 0)) return(NULL); -+ ret = (char *)malloc(len + 1); -+ if (ret == NULL) return(NULL); -+ strncpy(ret, str, len); -+ ret[len] = '\0'; -+ return(ret); -+} -+ - /* Support function for compute_locale_variants. */ - static int explode_locale(const char *locale, char **language, - char **territory, char **codeset, char **modifier) -@@ -118,7 +131,7 @@ static char **compute_locale_variants(co - if ((i & ~mask) == 0) { - int length = strlen(language) + strlen(territory) - + strlen(codeset) + strlen(modifier); -- char *var = (char *) malloc(sizeof(char) * length); -+ char *var = (char *) malloc(sizeof(char) * (length + 1)); - check_ptr(var, ""); - - strcpy(var, language); -@@ -144,7 +157,8 @@ static char **compute_locale_variants(co - pos = 0; - for (i = 0; i <= mask; i++) { - if (progress[i] != NULL) { -- retval[pos] = progress[i]; -+ retval[pos] = strdup(progress[i]); -+ free(progress[i]); - ++pos; - } - } -@@ -206,7 +220,7 @@ char **sk_get_language_list() - count++; - } - -- tab = (char ***)malloc(sizeof(char **) * count); -+ tab = (char ***)malloc(sizeof(char **) * (count + 1)); - - str = strdup(lang); - check_ptr(str, ""); -@@ -246,7 +260,8 @@ char **sk_get_language_list() - while (tab[j] != NULL) { - k = 0; - while (tab[j][k] != NULL) { -- retval[pos] = tab[j][k]; -+ retval[pos] = strdup(tab[j][k]); -+ free(tab[j][k]); - ++pos; - ++k; - } |