george/fiche
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not append a / at the end of the output path

Browse Source 
Solves issue #13
This commit is contained in:
Renaud Allard
2015-08-27 14:48:21 +02:00
parent d771d7bdfd
commit 1bc2132e1d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fiche.c
View File

@@ -286,9 +286,10 @@ void generate_url(char *buffer, char *slug, size_t slug_length, struct client_da
int create_directory(char *slug) int create_directory(char *slug)
{ {
char *directory = malloc(strlen(BASEDIR) + strlen(slug) + 1); char *directory = malloc(strlen(BASEDIR) + strlen(slug) + 2);
strcpy(directory, BASEDIR); strcpy(directory, BASEDIR);
strcat(directory, "/");
strcat(directory, slug); strcat(directory, slug);
mkdir(BASEDIR, S_IRWXU | S_IRGRP | S_IROTH | S_IXOTH | S_IXGRP); mkdir(BASEDIR, S_IRWXU | S_IRGRP | S_IROTH | S_IXOTH | S_IXGRP);
@@ -303,8 +304,9 @@ int create_directory(char *slug)
void save_to_file(char *slug, char *buffer, struct client_data data) void save_to_file(char *slug, char *buffer, struct client_data data)
{ {
char *directory = malloc(strlen(BASEDIR) + strlen(slug) + strlen("/index.txt") + 1); char *directory = malloc(strlen(BASEDIR) + strlen(slug) + strlen("/index.txt") + 2);
strcpy(directory, BASEDIR); strcpy(directory, BASEDIR);
strcat(directory, "/");
strcat(directory, slug); strcat(directory, slug);
strcat(directory, "/index.txt"); strcat(directory, "/index.txt");
@@ -348,7 +350,7 @@ int check_protocol(char *buffer)
void set_basedir() void set_basedir()
{ {
BASEDIR = getenv("HOME"); BASEDIR = getenv("HOME");
strcat(BASEDIR, "/code/"); strcat(BASEDIR, "/code");
} }
void startup_message() void startup_message()
@@ -387,8 +389,6 @@ void parse_parameters(int argc, char **argv)
break; break;
case 'o': case 'o':
BASEDIR = optarg; BASEDIR = optarg;
if((BASEDIR[strlen(BASEDIR) - 1]) != '/')
strcat(BASEDIR, "/");
break; break;
case 'l': case 'l':
LOG = optarg; LOG = optarg;