#348 Review usage of fgets in file reading

ToDo

@@ -28,7 +28,7 @@ Planned for later versions
     list of most used RST values which will then be used for scrolling,
     e.g. CHANGE_RST=339,479,599 or similar.
 [x] Have a template for cabrillo file header  (suggested by Joop PG4I)
-[ ] Add a keyword to startup TLF in S&P mode (should be an easy one)
+[x] Add a keyword to startup TLF in S&P mode (should be an easy one)
 [ ] switch between ESM and CT mode during contest (Nate N0NB)
 [x] Send Morse via Hamlib for radios that support it.
     Tnx Christoph DF7CB and others.

share/logcfg.dat

@@ -45,6 +45,15 @@ CALL=NOCALL
 #
 #################################
 #                               #
+#  OPERATING MODE               #
+#                               #
+#################################
+# Can be set to CQ, S&P
+OPERATING_MODE=CQ
+#
+#
+#################################
+#                               #
 #  Time offset from UTC         #
 #                               #
 #################################

src/addmult.c

@@ -23,7 +23,6 @@
  *
  *--------------------------------------------------------------*/
 
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -36,7 +35,6 @@
 #include "utils.h"
 #include "bands.h"
 
-
 GPtrArray *mults_possible;
 
 /*
@@ -106,7 +104,8 @@ static int addmult_internal(struct qso_t *qso, bool check_only) {
 
     /* -------------- unique call multi -------------- */
     else if (unique_call_multi != MULT_NONE) {
-	mult_index = remember_multi(qso->call, qso->bandindex, unique_call_multi, check_only);
+	mult_index = remember_multi(qso->call, qso->bandindex, unique_call_multi,
+				    check_only);
     }
 
     /* ------------ grid mult (per band) ------------- */
@@ -121,7 +120,6 @@ static int addmult_internal(struct qso_t *qso, bool check_only) {
 				    check_only);
     }
 
-
     free(stripped_comment);
     return mult_index;
 }
@@ -134,8 +132,6 @@ int check_mult(struct qso_t *qso) {
     return addmult_internal(qso, true); // check_only mode
 }
 
-
-
 /* -------------------------------------------------------------------*/
 
 void addmult_lan(void) {
@@ -195,7 +191,6 @@ void addmult_lan(void) {
 
 }
 
-
 /* lookup n-th position in list of possible mults and
  * return pointer to data structure */
 possible_mult_t *get_mult_base(int n) {
@@ -269,7 +264,6 @@ gint	cmp_size(char **a, char **b) {
     return g_strcmp0(t1->name, t2->name);
 }
 
-
 /* parse a mult line and add data to database
  *
  * multiline consists of either
@@ -336,57 +330,62 @@ void add_mult_line(char *line) {
 int init_and_load_multipliers(void) {
 
     FILE *cfp;
-    char s_inputbuffer[2000] = "";
+    char *s_inputbuffer = NULL;
+    size_t s_inputbuffer_len = 0;
     char *mults_location;
+    ssize_t read;
 
     if (mults_possible) {
-	/* free old array if exists */
-	g_ptr_array_free(mults_possible, TRUE);
+        /* free old array if exists */
+        g_ptr_array_free(mults_possible, TRUE);
     }
     mults_possible = g_ptr_array_new_with_free_func(free_possible_mult);
 
-
     if (strlen(multsfile) == 0) {
-	return 0;
+	    return 0;
     }
 
     mults_location = find_available(multsfile);
 
     if ((cfp = fopen(mults_location, "r")) == NULL) {
-	mvprintw(9, 0, "Error opening multiplier file %s.\n", multsfile);
-	refreshp();
-	sleep(5);
+        mvprintw(9, 0, "Error opening multiplier file %s.\n", multsfile);
+        refreshp();
+        sleep(5);
     }
 
     g_free(mults_location);
 
     if (cfp == NULL) {
-	return 0;       // couldn't open file
+	    return 0;       // couldn't open file
     }
 
-    while (fgets(s_inputbuffer, sizeof(s_inputbuffer), cfp) != NULL) {
-
-	/* strip leading and trailing whitespace */
-	g_strstrip(s_inputbuffer);
-
-	/* drop comments starting with '#' and empty lines */
-	if (*s_inputbuffer == '#' || *s_inputbuffer == '\0') {
-	    continue;
-	}
-
-	add_mult_line(s_inputbuffer);
-
+    while ((read = getline(&s_inputbuffer, &s_inputbuffer_len, cfp)) != -1) {
+            if (s_inputbuffer_len > 0) {
+                /* strip leading and trailing whitespace */
+                g_strstrip(s_inputbuffer);
+
+                /* drop comments starting with '#' and empty lines */
+                if (*s_inputbuffer == '#' || *s_inputbuffer == '\0') {
+                    continue;
+                }
+
+                add_mult_line(s_inputbuffer);
+            }
+            else {
+                perror("RuntimeError: ");
+                exit(EXIT_FAILURE);
+            }
     }
 
     fclose(cfp);
-
+    if (s_inputbuffer_len > 0)
+        free(s_inputbuffer);
     /* do not rely on the order in the mult file but sort it here */
     g_ptr_array_sort(mults_possible, (GCompareFunc)cmp_size);
 
     return get_mult_count();
 }
 
-
 /** initialize mults scoring
  *
  * empties multis[] array, set the number of multis and multscore per band to 0.