MirrorSave
/
caesium-clt
mirror of https://github.com/Lymphatus/caesium-clt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Lymphatus/caesium-clt

This commit is contained in:
Matteo Paonessa 2018-08-28 21:51:59 +02:00
parent 6de6be4824 1bd3533073
commit 025bf0ec5b
2 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/helper.c
View File

@ -49,28 +49,31 @@ cclt_options parse_arguments(char **argv, cs_image_pars *options) {
{0}
};
optparse_init(&opts, argv);
int option;
while ((option = optparse_long(&opts, longopts, NULL)) != -1) {
switch (option) {
case 'q':
options->jpeg.quality = (int) strtol(opts.optarg, (char **) NULL, 10);
if (options->jpeg.quality < 0 || options->jpeg.quality > 100) {
display_error(ERROR, 1);
}
break;
case 'e':
options->jpeg.exif_copy = true;
case 'o':
if (opts.optarg[0] == '~') {
snprintf(parameters.output_folder, strlen(opts.optarg) + 1, "%s", opts.optarg);
} else {
realpath(opts.optarg, parameters.output_folder);
}
int pathlen = (int) strlen(parameters.output_folder);
if (parameters.output_folder[pathlen - 1] != '/' &&
parameters.output_folder[pathlen - 1] != '\\') {
// append the extra slash/backslash
int option;
while ((option = optparse_long(&opts, longopts, NULL)) != -1) {
switch (option) {
case 'q':
options->jpeg.quality = (int) strtol(opts.optarg, (char **) NULL, 10);
if (options->jpeg.quality < 0 || options->jpeg.quality > 100) {
display_error(ERROR, 1);
}
break;
case 'e':
options->jpeg.exif_copy = true;
case 'o':
if (opts.optarg[0] == '~') {
snprintf(parameters.output_folder, strlen(opts.optarg) + 1, "%s", opts.optarg);
} else {
#ifdef _WIN32
_fullpath(parameters.output_folder, opts.optarg, MAX_PATH);
#else
realpath(opts.optarg, parameters.output_folder);
#endif
}
int pathlen = strlen(parameters.output_folder);
if (parameters.output_folder[pathlen - 1] != '/' &&
parameters.output_folder[pathlen - 1] != '\\') {
// append the extra slash/backslash
#ifdef _WIN32
snprintf(parameters.output_folder+pathlen, 2, "\\");
#else
@ -128,15 +131,20 @@ cclt_options parse_arguments(char **argv, cs_image_pars *options) {
#else
snprintf(resolved_path, strlen(arg) + 1, "%s/", arg);
#endif
}
} else {
realpath(arg, resolved_path);
}
if (is_directory(resolved_path)) {
if (!files_flag) {
folders_flag = true;
size_t len = strlen(resolved_path);
if (resolved_path[len - 1] != '/' && resolved_path[strlen(resolved_path) - 1] != '\\') {
}
} else {
#ifdef _WIN32
_fullpath(resolved_path, arg, MAX_PATH);
#else
realpath(arg, resolved_path);
#endif
}
if (is_directory(resolved_path)) {
if (!files_flag) {
folders_flag = true;
size_t len = strlen(resolved_path);
if (resolved_path[len - 1] != '/' && resolved_path[strlen(resolved_path) - 1] != '\\') {
#ifdef _WIN32
resolved_path[len] = '\\';
#else

9
src/utils.c
View File

@ -21,6 +21,9 @@
#include <caesium.h>
#include <limits.h>
#include <math.h>
#ifdef _WIN32
#include <stdint.h>
#endif
#include "utils.h"
#include "vendor/tinydir.h"
@ -110,9 +113,15 @@ int mkpath(const char *pathname)
return -1;
}
/* make this one if parent has been made */
#ifdef _WIN32
if (mkdir(pathname) == 0) {
return 0;
}
#else
if (mkdir(pathname, 0777) == 0) {
return 0;
}
#endif
/* if it already exists that is fine */
if (errno == EEXIST) {
return 0;