Update to 0.9.5

Changelog:

* New confirmation message before making changes.
* Fixed memory leaks.
* Refactored code.

Author: Usbac

README.md

@@ -1,7 +1,7 @@
 <h1 align="center">Nmly</h1>
 
 <p align="center">
-<img src="https://img.shields.io/badge/version-0.9.4-blue.svg"> <img src="https://img.shields.io/badge/license-MIT-orange.svg">
+<img src="https://img.shields.io/badge/version-0.9.5-blue.svg"> <img src="https://img.shields.io/badge/license-MIT-orange.svg">
 </p>
 
 <h4 align="center">Nmly is a massive file renamer utility with useful functions and written in C.</h4>

helper.c

@@ -180,24 +180,28 @@ char *changeCases(const char *dir, const char *filename, const int upper)
 	char *name = strBefore(filename, '.');
 	char *extension = strAfter(filename, '.');
 	char *new = malloc((strlen(dir) + strlen(filename) + 2) * sizeof(char));
-	char *cases = malloc(strlen(filename) * sizeof(char));
+	char *cases;
 
 	strcpy(new, dir);
 	strcat(new, "/");
 
 	//Without extension
 	if (name == NULL) {
+		cases = malloc(strlen(filename) + 1 * sizeof(char));
 		strCases(cases, filename, upper);
 		strcat(new, cases);
 	//With extension
 	} else {
+		cases = malloc(strlen(name) + 1 * sizeof(char));
 		strCases(cases, name, upper);
 		strcat(new, cases);
 		strcat(new, ".");
 		strcat(new, extension);
 	}
 
 	free(cases);
+	free(name);
+	free(extension);
 
 	return new;
 }
@@ -228,15 +232,18 @@ char *replace(const char *dir, const char *filename, const char *ori, const char
 	strcat(new, "/");
 	strcat(new, replaced);
 
+	free(replaced);
+
 	return new;
 }
 
 
 char *strReplace(const char *str, const char *ori, const char *rep)
 {
-	char *new = malloc(4096);
+	char *new = malloc(BUFFER * sizeof(char));
 	new[0] = '\0';
-	char *remaining = malloc(strlen(str) + 1 * sizeof(char));
+	char *remaining_ref = malloc(strlen(str) + 1 * sizeof(char));
+	char *remaining = remaining_ref;
 	char *pos;
 
 	strcpy(remaining, str);
@@ -253,6 +260,8 @@ char *strReplace(const char *str, const char *ori, const char *rep)
 
 	strcat(new, remaining);
 
+	free(remaining_ref);
+
 	return new;
 }
 
@@ -299,6 +308,7 @@ char *switchSides(const char *dir, const char *filename, const char sep)
 
 		doSwitch(new, tmp, part_one, part_two);
 
+		free(name);
 		free(part_one);
 		free(part_two);
 
@@ -319,6 +329,8 @@ char *switchSides(const char *dir, const char *filename, const char sep)
 	strcat(new, ".");
 	strcat(new, extension);
 
+	free(extension);
+	free(name);
 	free(part_one);
 	free(part_two);
 

helper.h

@@ -1,5 +1,6 @@
 #ifndef HELPER_H_
 #define HELPER_H_
+#define BUFFER 512
 
 /**
  * Copy a portion of the specified string into a new one.

nmly.c

@@ -9,22 +9,14 @@
 #include "nmly.h"
 #include "helper.h"
 
-#define BEFORE 0
-#define AFTER 1
-#define REPLACE 2
-#define UPPER 3
-#define LOWER 4
-#define SWITCH 5
-#define REVERSE 6
-#define REMOVE 7
-
 const char *preview_msg = "\n%i File(s) to be modified in %i folder(s)";
 const char *success_msg = "\n%i File(s) modified in %i folder(s)";
 const char *dir_error_msg = "Cannot open directory %s\n";
+const char *dir_confirm_msg = "Apply the changes in the following directory '%s'? [Y/n] ";
 const char *compare_msg = "%s > %s \n";
 const char *time_msg = "\n%f Segs\n";
 const char *arg_error_msg = "Error: Invalid command\n";
-const char *version_msg = "Nmly v0.9.4\n";
+const char *version_msg = "Nmly v0.9.5\n";
 char *working_path = ".";
 char *filter = "";
 int files_n = 0, folders_n = 0;
@@ -56,7 +48,7 @@ char *getChanges(char *path, char *argv[])
 {
 	char *dir = strBefore(path, '/');
 	char *filename = strAfter(path, '/');
-	char *new_path = path;
+	char *new_path = NULL;
 
 	//Matches filter by extension
 	char *extension = strAfter(filename, '.');
@@ -93,7 +85,7 @@ char *getChanges(char *path, char *argv[])
 void listDir(char *basedir, char *argv[])
 {
 	DIR *dir;
-	char b[512];
+	char b[BUFFER];
 	struct dirent *ent;
 
 	if ((dir = opendir(basedir)) == NULL) {
@@ -135,6 +127,8 @@ void processFile(char *entpath, char *argv[])
 	char *new_path = getChanges(entpath, argv);
 
 	if (new_path == NULL) {
+		free(new_path);
+		
 		return;
 	}
 
@@ -274,11 +268,23 @@ int main(int argc, char *argv[])
 
 	float start_time = (float) clock() / CLOCKS_PER_SEC;
 
+	//Confirmation
+	if (!preview) {
+		char confirm;
+
+		printf(dir_confirm_msg, working_path);
+		scanf("%c", &confirm);
+
+		if (confirm != 'Y' && confirm != 'y') {
+			return 0;
+		}
+	}
+
 	listDir(working_path, argv);
 
 	float total_time = ((float) clock() / CLOCKS_PER_SEC) - start_time;
 
-	const char *msg = (preview == 1) ? preview_msg : success_msg;
+	const char *msg = (preview) ? preview_msg : success_msg;
 	printf(msg, files_n, folders_n);
 	printf(time_msg, total_time);
 

nmly.h

@@ -1,6 +1,15 @@
 #ifndef NMLY_H_
 #define NMLY_H_
 
+#define BEFORE 0
+#define AFTER 1
+#define REPLACE 2
+#define UPPER 3
+#define LOWER 4
+#define SWITCH 5
+#define REVERSE 6
+#define REMOVE 7
+
 /**
  * Returns 1 if the specified path is a file, 0 otherwise.
  * @param path the path.
@@ -33,6 +42,7 @@ void listDir(char *basedir, char *argv[]);
 /**
  * Process the given file 
  * @param entpath the file path.
+ * @param argv the arguments array.
  */
 void processFile(char *entpath, char *argv[]);
 
@@ -48,8 +58,6 @@ int mapArgs(int argc, char *argv[]);
 
 /**
  * Display the help text.
- * @param test blah blah parameter.
- * @return 0 if blah blah passed.
  */
 void help();