From: Wolfgang Stöggl Date: Mon, 28 Jan 2019 20:00:08 +0000 (+0100) Subject: Use Unix line endings for win32-glob X-Git-Tag: v1.7.1~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e5ccbb467791ab475f672af92d1751489a8dc9c4;p=thirdparty%2Frrdtool-1.x.git Use Unix line endings for win32-glob - Restore original line endings for win32-glob.c and win32-glob.h - Furthermore, RRDtool source files use Unix line endings in general --- diff --git a/win32/win32-glob.c b/win32/win32-glob.c index 111565ad..74f389d3 100644 --- a/win32/win32-glob.c +++ b/win32/win32-glob.c @@ -1,169 +1,169 @@ -/* libSoX minimal glob for MS-Windows: (c) 2009 SoX contributors - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or (at - * your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser - * General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "win32-glob.h" -#include -#include -#include -#define WIN32_LEAN_AND_MEAN 1 -#include - -typedef struct file_entry -{ - char name[MAX_PATH]; - struct file_entry *next; -} file_entry; - -static int -insert( - const char* path, - const char* name, - file_entry** phead) -{ - int len; - file_entry* cur = malloc(sizeof(file_entry)); - if (!cur) - { - return ENOMEM; - } - - len = _snprintf(cur->name, MAX_PATH, "%s%s", path, name); - cur->name[MAX_PATH - 1] = 0; - cur->next = *phead; - *phead = cur; - - return len < 0 || len >= MAX_PATH ? ENAMETOOLONG : 0; -} - -static int -entry_comparer( - const void* pv1, - const void* pv2) -{ - const file_entry* const * pe1 = pv1; - const file_entry* const * pe2 = pv2; - return _stricmp((*pe1)->name, (*pe2)->name); -} - -int -glob( - const char *pattern, - int flags, - void *unused, - glob_t *pglob) -{ - char path[MAX_PATH]; - file_entry *head = NULL; - int err = 0; - size_t len; - unsigned entries = 0; - WIN32_FIND_DATAA finddata; - HANDLE hfindfile = FindFirstFileA(pattern, &finddata); - - if (!pattern || flags != (flags & GLOB_FLAGS) || unused || !pglob) - { - errno = EINVAL; - return EINVAL; - } - - path[MAX_PATH - 1] = 0; - strncpy(path, pattern, MAX_PATH); - if (path[MAX_PATH - 1] != 0) - { - errno = ENAMETOOLONG; - return ENAMETOOLONG; - } - - len = strlen(path); - while (len > 0 && path[len - 1] != '/' && path[len - 1] != '\\') - len--; - path[len] = 0; - - if (hfindfile == INVALID_HANDLE_VALUE) - { - if (flags & GLOB_NOCHECK) - { - err = insert("", pattern, &head); - entries++; - } - } - else - { - do - { - err = insert(path, finddata.cFileName, &head); - entries++; - } while (!err && FindNextFileA(hfindfile, &finddata)); - - FindClose(hfindfile); - } - - if (err == 0) - { - pglob->gl_pathv = malloc((entries + 1) * sizeof(char*)); - if (pglob->gl_pathv) - { - pglob->gl_pathc = entries; - pglob->gl_pathv[entries] = NULL; - for (; head; head = head->next, entries--) - pglob->gl_pathv[entries - 1] = (char*)head; - qsort(pglob->gl_pathv, pglob->gl_pathc, sizeof(char*), entry_comparer); - } - else - { - pglob->gl_pathc = 0; - err = ENOMEM; - } - } - else if (pglob) - { - pglob->gl_pathc = 0; - pglob->gl_pathv = NULL; - } - - if (err) - { - file_entry *cur; - while (head) - { - cur = head; - head = head->next; - free(cur); - } - - errno = err; - } - - return err; -} - -void -globfree( - glob_t* pglob) -{ - if (pglob) - { - char** cur; - for (cur = pglob->gl_pathv; *cur; cur++) - { - free(*cur); - } - - pglob->gl_pathc = 0; - pglob->gl_pathv = NULL; - } -} +/* libSoX minimal glob for MS-Windows: (c) 2009 SoX contributors + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at + * your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser + * General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "win32-glob.h" +#include +#include +#include +#define WIN32_LEAN_AND_MEAN 1 +#include + +typedef struct file_entry +{ + char name[MAX_PATH]; + struct file_entry *next; +} file_entry; + +static int +insert( + const char* path, + const char* name, + file_entry** phead) +{ + int len; + file_entry* cur = malloc(sizeof(file_entry)); + if (!cur) + { + return ENOMEM; + } + + len = _snprintf(cur->name, MAX_PATH, "%s%s", path, name); + cur->name[MAX_PATH - 1] = 0; + cur->next = *phead; + *phead = cur; + + return len < 0 || len >= MAX_PATH ? ENAMETOOLONG : 0; +} + +static int +entry_comparer( + const void* pv1, + const void* pv2) +{ + const file_entry* const * pe1 = pv1; + const file_entry* const * pe2 = pv2; + return _stricmp((*pe1)->name, (*pe2)->name); +} + +int +glob( + const char *pattern, + int flags, + void *unused, + glob_t *pglob) +{ + char path[MAX_PATH]; + file_entry *head = NULL; + int err = 0; + size_t len; + unsigned entries = 0; + WIN32_FIND_DATAA finddata; + HANDLE hfindfile = FindFirstFileA(pattern, &finddata); + + if (!pattern || flags != (flags & GLOB_FLAGS) || unused || !pglob) + { + errno = EINVAL; + return EINVAL; + } + + path[MAX_PATH - 1] = 0; + strncpy(path, pattern, MAX_PATH); + if (path[MAX_PATH - 1] != 0) + { + errno = ENAMETOOLONG; + return ENAMETOOLONG; + } + + len = strlen(path); + while (len > 0 && path[len - 1] != '/' && path[len - 1] != '\\') + len--; + path[len] = 0; + + if (hfindfile == INVALID_HANDLE_VALUE) + { + if (flags & GLOB_NOCHECK) + { + err = insert("", pattern, &head); + entries++; + } + } + else + { + do + { + err = insert(path, finddata.cFileName, &head); + entries++; + } while (!err && FindNextFileA(hfindfile, &finddata)); + + FindClose(hfindfile); + } + + if (err == 0) + { + pglob->gl_pathv = malloc((entries + 1) * sizeof(char*)); + if (pglob->gl_pathv) + { + pglob->gl_pathc = entries; + pglob->gl_pathv[entries] = NULL; + for (; head; head = head->next, entries--) + pglob->gl_pathv[entries - 1] = (char*)head; + qsort(pglob->gl_pathv, pglob->gl_pathc, sizeof(char*), entry_comparer); + } + else + { + pglob->gl_pathc = 0; + err = ENOMEM; + } + } + else if (pglob) + { + pglob->gl_pathc = 0; + pglob->gl_pathv = NULL; + } + + if (err) + { + file_entry *cur; + while (head) + { + cur = head; + head = head->next; + free(cur); + } + + errno = err; + } + + return err; +} + +void +globfree( + glob_t* pglob) +{ + if (pglob) + { + char** cur; + for (cur = pglob->gl_pathv; *cur; cur++) + { + free(*cur); + } + + pglob->gl_pathc = 0; + pglob->gl_pathv = NULL; + } +} diff --git a/win32/win32-glob.h b/win32/win32-glob.h index 3dca881b..30f41796 100644 --- a/win32/win32-glob.h +++ b/win32/win32-glob.h @@ -1,49 +1,49 @@ -/* libSoX minimal glob for MS-Windows: (c) 2009 SoX contributors - * - * This library is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2.1 of the License, or (at - * your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser - * General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef GLOB_H -#define GLOB_H 1 - -#define GLOB_NOCHECK (16) -#define GLOB_FLAGS (GLOB_NOCHECK) - -typedef struct glob_t -{ - unsigned gl_pathc; - char **gl_pathv; -} glob_t; - -#ifdef __cplusplus -extern "C" { -#endif - -int -glob( - const char *pattern, - int flags, - void *unused, - glob_t *pglob); - -void -globfree( - glob_t* pglob); - -#ifdef __cplusplus -} -#endif - -#endif /* ifndef GLOB_H */ +/* libSoX minimal glob for MS-Windows: (c) 2009 SoX contributors + * + * This library is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or (at + * your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser + * General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef GLOB_H +#define GLOB_H 1 + +#define GLOB_NOCHECK (16) +#define GLOB_FLAGS (GLOB_NOCHECK) + +typedef struct glob_t +{ + unsigned gl_pathc; + char **gl_pathv; +} glob_t; + +#ifdef __cplusplus +extern "C" { +#endif + +int +glob( + const char *pattern, + int flags, + void *unused, + glob_t *pglob); + +void +globfree( + glob_t* pglob); + +#ifdef __cplusplus +} +#endif + +#endif /* ifndef GLOB_H */