From 3379474d827c2445088458455abd46e4e32246b5 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 15 Feb 2020 20:49:23 +0800 Subject: [PATCH] Version bump to R20.2.15 --- package/lean/default-settings/Makefile | 4 +- .../files/zzz-default-settings | 3 +- .../default-settings/tools/po2lmo/Makefile | 12 - .../default-settings/tools/po2lmo/src/po2lmo | Bin 17424 -> 0 bytes .../tools/po2lmo/src/po2lmo.c | 247 ------------- .../tools/po2lmo/src/template_lmo.c | 328 ------------------ .../tools/po2lmo/src/template_lmo.h | 92 ----- 7 files changed, 2 insertions(+), 684 deletions(-) delete mode 100644 package/lean/default-settings/tools/po2lmo/Makefile delete mode 100644 package/lean/default-settings/tools/po2lmo/src/po2lmo delete mode 100644 package/lean/default-settings/tools/po2lmo/src/po2lmo.c delete mode 100644 package/lean/default-settings/tools/po2lmo/src/template_lmo.c delete mode 100644 package/lean/default-settings/tools/po2lmo/src/template_lmo.h diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index 08307c4e2..cd64d7eaa 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.1 -PKG_RELEASE:=50 +PKG_RELEASE:=51 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE @@ -29,8 +29,6 @@ define Package/default-settings/description endef define Build/Prepare - $(foreach po,$(wildcard ${CURDIR}/i18n/*.po), \ - po2lmo $(po) $(PKG_BUILD_DIR)/$(patsubst %.po,%.lmo,$(notdir $(po)));) endef define Build/Configure diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 87a639e83..9d0567d76 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -41,10 +41,9 @@ echo "iptables -t nat -A PREROUTING -p tcp --dport 53 -j REDIRECT --to-ports 53" sed -i '/option disabled/d' /etc/config/wireless sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh -wifi up sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release -echo "DISTRIB_REVISION='R20.1.24'" >> /etc/openwrt_release +echo "DISTRIB_REVISION='R20.2.15'" >> /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release diff --git a/package/lean/default-settings/tools/po2lmo/Makefile b/package/lean/default-settings/tools/po2lmo/Makefile deleted file mode 100644 index ad2c13320..000000000 --- a/package/lean/default-settings/tools/po2lmo/Makefile +++ /dev/null @@ -1,12 +0,0 @@ - -INSTALL = install -PREFIX = /usr/bin - -po2lmo: src/po2lmo.o src/template_lmo.o - $(CC) $(LDFLAGS) -o src/po2lmo src/po2lmo.o src/template_lmo.o - -install: - $(INSTALL) -m 755 src/po2lmo $(PREFIX) - -clean: - $(RM) src/po2lmo src/*.o diff --git a/package/lean/default-settings/tools/po2lmo/src/po2lmo b/package/lean/default-settings/tools/po2lmo/src/po2lmo deleted file mode 100644 index 134a59c27bdeb6dc92f3cd225a5ce411f121ad8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17424 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�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 UeYAsP!>X?r%sz7vfoJObZ#|)5-T(jq diff --git a/package/lean/default-settings/tools/po2lmo/src/po2lmo.c b/package/lean/default-settings/tools/po2lmo/src/po2lmo.c deleted file mode 100644 index 0da792b68..000000000 --- a/package/lean/default-settings/tools/po2lmo/src/po2lmo.c +++ /dev/null @@ -1,247 +0,0 @@ -/* - * lmo - Lua Machine Objects - PO to LMO conversion tool - * - * Copyright (C) 2009-2012 Jo-Philipp Wich - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "template_lmo.h" - -static void die(const char *msg) -{ - fprintf(stderr, "Error: %s\n", msg); - exit(1); -} - -static void usage(const char *name) -{ - fprintf(stderr, "Usage: %s input.po output.lmo\n", name); - exit(1); -} - -static void print(const void *ptr, size_t size, size_t nmemb, FILE *stream) -{ - if( fwrite(ptr, size, nmemb, stream) == 0 ) - die("Failed to write stdout"); -} - -static int extract_string(const char *src, char *dest, int len) -{ - int pos = 0; - int esc = 0; - int off = -1; - - for( pos = 0; (pos < strlen(src)) && (pos < len); pos++ ) - { - if( (off == -1) && (src[pos] == '"') ) - { - off = pos + 1; - } - else if( off >= 0 ) - { - if( esc == 1 ) - { - switch (src[pos]) - { - case '"': - case '\\': - off++; - break; - } - dest[pos-off] = src[pos]; - esc = 0; - } - else if( src[pos] == '\\' ) - { - dest[pos-off] = src[pos]; - esc = 1; - } - else if( src[pos] != '"' ) - { - dest[pos-off] = src[pos]; - } - else - { - dest[pos-off] = '\0'; - break; - } - } - } - - return (off > -1) ? strlen(dest) : -1; -} - -static int cmp_index(const void *a, const void *b) -{ - uint32_t x = ((const lmo_entry_t *)a)->key_id; - uint32_t y = ((const lmo_entry_t *)b)->key_id; - - if (x < y) - return -1; - else if (x > y) - return 1; - - return 0; -} - -static void print_uint32(uint32_t x, FILE *out) -{ - uint32_t y = htonl(x); - print(&y, sizeof(uint32_t), 1, out); -} - -static void print_index(void *array, int n, FILE *out) -{ - lmo_entry_t *e; - - qsort(array, n, sizeof(*e), cmp_index); - - for (e = array; n > 0; n--, e++) - { - print_uint32(e->key_id, out); - print_uint32(e->val_id, out); - print_uint32(e->offset, out); - print_uint32(e->length, out); - } -} - -int main(int argc, char *argv[]) -{ - char line[4096]; - char key[4096]; - char val[4096]; - char tmp[4096]; - int state = 0; - int offset = 0; - int length = 0; - int n_entries = 0; - void *array = NULL; - lmo_entry_t *entry = NULL; - uint32_t key_id, val_id; - - FILE *in; - FILE *out; - - if( (argc != 3) || ((in = fopen(argv[1], "r")) == NULL) || ((out = fopen(argv[2], "w")) == NULL) ) - usage(argv[0]); - - memset(line, 0, sizeof(key)); - memset(key, 0, sizeof(val)); - memset(val, 0, sizeof(val)); - - while( (NULL != fgets(line, sizeof(line), in)) || (state >= 2 && feof(in)) ) - { - if( state == 0 && strstr(line, "msgid \"") == line ) - { - switch(extract_string(line, key, sizeof(key))) - { - case -1: - die("Syntax error in msgid"); - case 0: - state = 1; - break; - default: - state = 2; - } - } - else if( state == 1 || state == 2 ) - { - if( strstr(line, "msgstr \"") == line || state == 2 ) - { - switch(extract_string(line, val, sizeof(val))) - { - case -1: - state = 4; - break; - default: - state = 3; - } - } - else - { - switch(extract_string(line, tmp, sizeof(tmp))) - { - case -1: - state = 2; - break; - default: - strcat(key, tmp); - } - } - } - else if( state == 3 ) - { - switch(extract_string(line, tmp, sizeof(tmp))) - { - case -1: - state = 4; - break; - default: - strcat(val, tmp); - } - } - - if( state == 4 ) - { - if( strlen(key) > 0 && strlen(val) > 0 ) - { - key_id = sfh_hash(key, strlen(key)); - val_id = sfh_hash(val, strlen(val)); - - if( key_id != val_id ) - { - n_entries++; - array = realloc(array, n_entries * sizeof(lmo_entry_t)); - entry = (lmo_entry_t *)array + n_entries - 1; - - if (!array) - die("Out of memory"); - - entry->key_id = key_id; - entry->val_id = val_id; - entry->offset = offset; - entry->length = strlen(val); - - length = strlen(val) + ((4 - (strlen(val) % 4)) % 4); - - print(val, length, 1, out); - offset += length; - } - } - - state = 0; - memset(key, 0, sizeof(key)); - memset(val, 0, sizeof(val)); - } - - memset(line, 0, sizeof(line)); - } - - print_index(array, n_entries, out); - - if( offset > 0 ) - { - print_uint32(offset, out); - fsync(fileno(out)); - fclose(out); - } - else - { - fclose(out); - unlink(argv[2]); - } - - fclose(in); - return(0); -} diff --git a/package/lean/default-settings/tools/po2lmo/src/template_lmo.c b/package/lean/default-settings/tools/po2lmo/src/template_lmo.c deleted file mode 100644 index 27205a722..000000000 --- a/package/lean/default-settings/tools/po2lmo/src/template_lmo.c +++ /dev/null @@ -1,328 +0,0 @@ -/* - * lmo - Lua Machine Objects - Base functions - * - * Copyright (C) 2009-2010 Jo-Philipp Wich - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "template_lmo.h" - -/* - * Hash function from http://www.azillionmonkeys.com/qed/hash.html - * Copyright (C) 2004-2008 by Paul Hsieh - */ - -uint32_t sfh_hash(const char *data, int len) -{ - uint32_t hash = len, tmp; - int rem; - - if (len <= 0 || data == NULL) return 0; - - rem = len & 3; - len >>= 2; - - /* Main loop */ - for (;len > 0; len--) { - hash += sfh_get16(data); - tmp = (sfh_get16(data+2) << 11) ^ hash; - hash = (hash << 16) ^ tmp; - data += 2*sizeof(uint16_t); - hash += hash >> 11; - } - - /* Handle end cases */ - switch (rem) { - case 3: hash += sfh_get16(data); - hash ^= hash << 16; - hash ^= data[sizeof(uint16_t)] << 18; - hash += hash >> 11; - break; - case 2: hash += sfh_get16(data); - hash ^= hash << 11; - hash += hash >> 17; - break; - case 1: hash += *data; - hash ^= hash << 10; - hash += hash >> 1; - } - - /* Force "avalanching" of final 127 bits */ - hash ^= hash << 3; - hash += hash >> 5; - hash ^= hash << 4; - hash += hash >> 17; - hash ^= hash << 25; - hash += hash >> 6; - - return hash; -} - -uint32_t lmo_canon_hash(const char *str, int len) -{ - char res[4096]; - char *ptr, prev; - int off; - - if (!str || len >= sizeof(res)) - return 0; - - for (prev = ' ', ptr = res, off = 0; off < len; prev = *str, off++, str++) - { - if (isspace(*str)) - { - if (!isspace(prev)) - *ptr++ = ' '; - } - else - { - *ptr++ = *str; - } - } - - if ((ptr > res) && isspace(*(ptr-1))) - ptr--; - - return sfh_hash(res, ptr - res); -} - -lmo_archive_t * lmo_open(const char *file) -{ - int in = -1; - uint32_t idx_offset = 0; - struct stat s; - - lmo_archive_t *ar = NULL; - - if (stat(file, &s) == -1) - goto err; - - if ((in = open(file, O_RDONLY)) == -1) - goto err; - - if ((ar = (lmo_archive_t *)malloc(sizeof(*ar))) != NULL) - { - memset(ar, 0, sizeof(*ar)); - - ar->fd = in; - ar->size = s.st_size; - - fcntl(ar->fd, F_SETFD, fcntl(ar->fd, F_GETFD) | FD_CLOEXEC); - - if ((ar->mmap = mmap(NULL, ar->size, PROT_READ, MAP_SHARED, ar->fd, 0)) == MAP_FAILED) - goto err; - - idx_offset = ntohl(*((const uint32_t *) - (ar->mmap + ar->size - sizeof(uint32_t)))); - - if (idx_offset >= ar->size) - goto err; - - ar->index = (lmo_entry_t *)(ar->mmap + idx_offset); - ar->length = (ar->size - idx_offset - sizeof(uint32_t)) / sizeof(lmo_entry_t); - ar->end = ar->mmap + ar->size; - - return ar; - } - -err: - if (in > -1) - close(in); - - if (ar != NULL) - { - if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED)) - munmap(ar->mmap, ar->size); - - free(ar); - } - - return NULL; -} - -void lmo_close(lmo_archive_t *ar) -{ - if (ar != NULL) - { - if ((ar->mmap != NULL) && (ar->mmap != MAP_FAILED)) - munmap(ar->mmap, ar->size); - - close(ar->fd); - free(ar); - - ar = NULL; - } -} - - -lmo_catalog_t *_lmo_catalogs = NULL; -lmo_catalog_t *_lmo_active_catalog = NULL; - -int lmo_load_catalog(const char *lang, const char *dir) -{ - DIR *dh = NULL; - char pattern[16]; - char path[PATH_MAX]; - struct dirent *de = NULL; - - lmo_archive_t *ar = NULL; - lmo_catalog_t *cat = NULL; - - if (!lmo_change_catalog(lang)) - return 0; - - if (!dir || !(dh = opendir(dir))) - goto err; - - if (!(cat = malloc(sizeof(*cat)))) - goto err; - - memset(cat, 0, sizeof(*cat)); - - snprintf(cat->lang, sizeof(cat->lang), "%s", lang); - snprintf(pattern, sizeof(pattern), "*.%s.lmo", lang); - - while ((de = readdir(dh)) != NULL) - { - if (!fnmatch(pattern, de->d_name, 0)) - { - snprintf(path, sizeof(path), "%s/%s", dir, de->d_name); - ar = lmo_open(path); - - if (ar) - { - ar->next = cat->archives; - cat->archives = ar; - } - } - } - - closedir(dh); - - cat->next = _lmo_catalogs; - _lmo_catalogs = cat; - - if (!_lmo_active_catalog) - _lmo_active_catalog = cat; - - return 0; - -err: - if (dh) closedir(dh); - if (cat) free(cat); - - return -1; -} - -int lmo_change_catalog(const char *lang) -{ - lmo_catalog_t *cat; - - for (cat = _lmo_catalogs; cat; cat = cat->next) - { - if (!strncmp(cat->lang, lang, sizeof(cat->lang))) - { - _lmo_active_catalog = cat; - return 0; - } - } - - return -1; -} - -static lmo_entry_t * lmo_find_entry(lmo_archive_t *ar, uint32_t hash) -{ - unsigned int m, l, r; - uint32_t k; - - l = 0; - r = ar->length - 1; - - while (1) - { - m = l + ((r - l) / 2); - - if (r < l) - break; - - k = ntohl(ar->index[m].key_id); - - if (k == hash) - return &ar->index[m]; - - if (k > hash) - { - if (!m) - break; - - r = m - 1; - } - else - { - l = m + 1; - } - } - - return NULL; -} - -int lmo_translate(const char *key, int keylen, char **out, int *outlen) -{ - uint32_t hash; - lmo_entry_t *e; - lmo_archive_t *ar; - - if (!key || !_lmo_active_catalog) - return -2; - - hash = lmo_canon_hash(key, keylen); - - for (ar = _lmo_active_catalog->archives; ar; ar = ar->next) - { - if ((e = lmo_find_entry(ar, hash)) != NULL) - { - *out = ar->mmap + ntohl(e->offset); - *outlen = ntohl(e->length); - return 0; - } - } - - return -1; -} - -void lmo_close_catalog(const char *lang) -{ - lmo_archive_t *ar, *next; - lmo_catalog_t *cat, *prev; - - for (prev = NULL, cat = _lmo_catalogs; cat; prev = cat, cat = cat->next) - { - if (!strncmp(cat->lang, lang, sizeof(cat->lang))) - { - if (prev) - prev->next = cat->next; - else - _lmo_catalogs = cat->next; - - for (ar = cat->archives; ar; ar = next) - { - next = ar->next; - lmo_close(ar); - } - - free(cat); - break; - } - } -} diff --git a/package/lean/default-settings/tools/po2lmo/src/template_lmo.h b/package/lean/default-settings/tools/po2lmo/src/template_lmo.h deleted file mode 100644 index 57f59aa56..000000000 --- a/package/lean/default-settings/tools/po2lmo/src/template_lmo.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * lmo - Lua Machine Objects - General header - * - * Copyright (C) 2009-2012 Jo-Philipp Wich - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _TEMPLATE_LMO_H_ -#define _TEMPLATE_LMO_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if (defined(__GNUC__) && defined(__i386__)) -#define sfh_get16(d) (*((const uint16_t *) (d))) -#else -#define sfh_get16(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8)\ - +(uint32_t)(((const uint8_t *)(d))[0]) ) -#endif - - -struct lmo_entry { - uint32_t key_id; - uint32_t val_id; - uint32_t offset; - uint32_t length; -} __attribute__((packed)); - -typedef struct lmo_entry lmo_entry_t; - - -struct lmo_archive { - int fd; - int length; - uint32_t size; - lmo_entry_t *index; - char *mmap; - char *end; - struct lmo_archive *next; -}; - -typedef struct lmo_archive lmo_archive_t; - - -struct lmo_catalog { - char lang[6]; - struct lmo_archive *archives; - struct lmo_catalog *next; -}; - -typedef struct lmo_catalog lmo_catalog_t; - - -uint32_t sfh_hash(const char *data, int len); -uint32_t lmo_canon_hash(const char *data, int len); - -lmo_archive_t * lmo_open(const char *file); -void lmo_close(lmo_archive_t *ar); - - -extern lmo_catalog_t *_lmo_catalogs; -extern lmo_catalog_t *_lmo_active_catalog; - -int lmo_load_catalog(const char *lang, const char *dir); -int lmo_change_catalog(const char *lang); -int lmo_translate(const char *key, int keylen, char **out, int *outlen); -void lmo_close_catalog(const char *lang); - -#endif