diary

commit 396f72b983bfabec0b1a9cf3f79cdca1b29a1f53
parent ea39be827a4e1bd01af650ab3b838fbbd83eeaee
Author: Andreas Gruhler <agruhl@gmx.ch>
Date:   Fri,  1 Jan 2021 18:02:03 +0100

Fix sizeof diary_dir

The size of the character array cannot be determined from within the
function `set_diary_dir`.

Similar to the other functions (edit_cmd, fpath, etc.), add the size of
the array as an additional input parameter.

Fixes https://github.com/in0rdr/diary/issues/55

Diffstat:
M
diary.c
 | 
14
+++++++-------

1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/diary.c b/diary.c
@@ -289,14 +289,14 @@ struct tm find_closest_entry(const struct tm current,
 
 /* Set the diary storage directory.
 *  Copies the path to the storage directory from character
-*  string `path` to the destination location `diary_dir`
+*  string `path` to the destination location `pdiary_dir`
 */
-bool set_diary_dir(char* path, char* diary_dir) {
-    if (strlen(path) + 1 > sizeof diary_dir) {
+bool set_diary_dir(char* path, char* pdiary_dir, size_t diary_dir_size) {
+    if (strlen(path) + 1 > diary_dir_size) {
         fprintf(stderr, "Diary directory path too long\n");
         return false;
     }
-    strcpy(diary_dir, path);
+    strcpy(pdiary_dir, path);
     return true;
 }
 
@@ -335,7 +335,7 @@ int main(int argc, char** argv) {
         }
 
         // set diary directory from environment variable
-        if ( !set_diary_dir(env_var, diary_dir) ) {
+        if ( !set_diary_dir(env_var, diary_dir, sizeof diary_dir) ) {
             return 1;
         }
     } else {
@@ -372,7 +372,7 @@ int main(int argc, char** argv) {
                     break;
                 case 'd':
                     // set diary directory from option character
-                    if ( !set_diary_dir(optarg, diary_dir) ) {
+                    if ( !set_diary_dir(optarg, diary_dir, sizeof diary_dir) ) {
                         return 1;
                     }
                     break;
@@ -384,7 +384,7 @@ int main(int argc, char** argv) {
         if (optind < argc) {
             // set diary directory from first non-option argv-element,
             // required for backwarad compatibility with diary <= 0.4
-            if ( !set_diary_dir(argv[optind], diary_dir) ) {
+            if ( !set_diary_dir(argv[optind], diary_dir, sizeof diary_dir) ) {
                 return 1;
             }
         }