mirror of
https://github.com/moparisthebest/curl
synced 2024-11-14 13:35:03 -05:00
4520534e6d
- Add unit test 1604 to test the sanitize_file_name function.
- Use -DCURL_STATICLIB when building libcurltool for unit testing.
- Better detection of reserved DOS device names.
- New flags to modify sanitize behavior:
SANITIZE_ALLOW_COLONS: Allow colons
SANITIZE_ALLOW_PATH: Allow path separators and colons
SANITIZE_ALLOW_RESERVED: Allow reserved device names
SANITIZE_ALLOW_TRUNCATE: Allow truncating a long filename
- Restore sanitization of banned characters from user-specified outfile.
Prior to this commit sanitization of a user-specified outfile was
temporarily disabled in 2b6dadc because there was no way to allow path
separators and colons through while replacing other banned characters.
Now in such a case we call the sanitize function with
SANITIZE_ALLOW_PATH which allows path separators and colons to pass
through.
Closes https://github.com/curl/curl/issues/624
Reported-by: Octavio Schroeder
69 lines
2.6 KiB
C
69 lines
2.6 KiB
C
#ifndef HEADER_CURL_TOOL_DOSWIN_H
|
|
#define HEADER_CURL_TOOL_DOSWIN_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
#include "tool_setup.h"
|
|
|
|
#if defined(MSDOS) || defined(WIN32)
|
|
|
|
#define SANITIZE_ALLOW_COLONS (1<<0) /* Allow colons */
|
|
#define SANITIZE_ALLOW_PATH (1<<1) /* Allow path separators and colons */
|
|
#define SANITIZE_ALLOW_RESERVED (1<<2) /* Allow reserved device names */
|
|
#define SANITIZE_ALLOW_TRUNCATE (1<<3) /* Allow truncating a long filename */
|
|
|
|
typedef enum {
|
|
SANITIZE_ERR_OK = 0, /* 0 - OK */
|
|
SANITIZE_ERR_INVALID_PATH, /* 1 - the path is invalid */
|
|
SANITIZE_ERR_BAD_ARGUMENT, /* 2 - bad function parameter */
|
|
SANITIZE_ERR_OUT_OF_MEMORY, /* 3 - out of memory */
|
|
SANITIZE_ERR_LAST /* never use! */
|
|
} SANITIZEcode;
|
|
|
|
SANITIZEcode sanitize_file_name(char **const sanitized, const char *file_name,
|
|
int flags);
|
|
#ifdef UNITTESTS
|
|
SANITIZEcode truncate_dryrun(const char *path, const size_t truncate_pos);
|
|
SANITIZEcode msdosify(char **const sanitized, const char *file_name,
|
|
int flags);
|
|
SANITIZEcode rename_if_reserved_dos_device_name(char **const sanitized,
|
|
const char *file_name,
|
|
int flags);
|
|
#endif /* UNITTESTS */
|
|
|
|
#if defined(MSDOS) && (defined(__DJGPP__) || defined(__GO32__))
|
|
|
|
char **__crt0_glob_function(char *arg);
|
|
|
|
#endif /* MSDOS && (__DJGPP__ || __GO32__) */
|
|
|
|
#ifdef WIN32
|
|
|
|
CURLcode FindWin32CACert(struct OperationConfig *config,
|
|
const char *bundle_file);
|
|
|
|
#endif /* WIN32 */
|
|
|
|
#endif /* MSDOS || WIN32 */
|
|
|
|
#endif /* HEADER_CURL_TOOL_DOSWIN_H */
|
|
|