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

Avoid using strcpy and strcat

Browse Source 
That will also remove the warnings given by picky compilers
This commit is contained in:
Renaud Allard
2015-08-27 15:55:09 +02:00
parent caa6f5ed6a
commit 8ccfcc8c06
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fiche.c
View File

@@ -288,9 +288,7 @@ int create_directory(char *slug)
{ {
char *directory = malloc(strlen(BASEDIR) + strlen(slug) + sizeof(char) + 1); char *directory = malloc(strlen(BASEDIR) + strlen(slug) + sizeof(char) + 1);
strcpy(directory, BASEDIR); snprintf(directory, strlen(BASEDIR) + strlen(slug) + sizeof(char) + 1, "%s%s%s", BASEDIR, "/", slug);
strcat(directory, "/");
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);
int result = mkdir(directory, S_IRWXU | S_IRGRP | S_IROTH | S_IXOTH | S_IXGRP); int result = mkdir(directory, S_IRWXU | S_IRGRP | S_IROTH | S_IXOTH | S_IXGRP);
@@ -304,11 +302,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") + sizeof(char) + 1 ); char *directory = malloc(strlen(BASEDIR) + strlen(slug) + 11 * sizeof(char) + 1 );
strcpy(directory, BASEDIR);
strcat(directory, "/"); snprintf(directory, strlen(BASEDIR) + strlen(slug) + 11 * sizeof(char) + 1, "%s%s%s%s", BASEDIR , "/", slug, "/index.txt");
strcat(directory, slug);
strcat(directory, "/index.txt");
FILE *fp; FILE *fp;
fp = fopen(directory, "w"); fp = fopen(directory, "w");
@@ -350,7 +346,7 @@ int check_protocol(char *buffer)
void set_basedir() void set_basedir()
{ {
BASEDIR = getenv("HOME"); BASEDIR = getenv("HOME");
strcat(BASEDIR, "/code"); strncat(BASEDIR, "/code", 5 * sizeof(char));
} }
void startup_message() void startup_message()