Fix incorrect free()

[c128-kasse] / src / credit_manager.c

diff --git a/src/credit_manager.c b/src/credit_manager.c
index 57197ce73949dd8a4144df65925a5d168420c746..6654324e1bdd644a51d95b2bc598abd717ffe99f 100644 (file)
--- a/src/credit_manager.c
+++ b/src/credit_manager.c
@@ -15,6 +15,7 @@
 #include "c128time.h"
 #include "print.h"
 #include "version.h"
+#include "vdc_patch_charset.h"
 
 static char *filter = NULL;
 static BYTE filter_len;
@@ -23,7 +24,7 @@ static BYTE current_credits_page = 0;
 
 static void credit_print_screen(void) {
   BYTE i, pages;
-  char buffer[10];
+  char buffer[EUR_FORMAT_MINLEN + 1];
 
   clrscr();
   cprintf("credit_manager (phil_fry, sECuRE, sur5r) v:" GV "\r\n\r\n");
@@ -38,7 +39,8 @@ static void credit_print_screen(void) {
        i++) {
     if (filter == NULL ||
         strncmp(credits.credits[i].nickname, filter, filter_len) == 0) {
-      if (format_euro(buffer, 10, credits.credits[i].credit) != buffer) {
+      if (format_euro(buffer, sizeof(buffer), credits.credits[i].credit) !=
+          buffer) {
         cprintf("Error: Could not format credit %d\r\n",
                 credits.credits[i].credit);
         exit(1);
@@ -47,8 +49,9 @@ static void credit_print_screen(void) {
       cprintf("%d: %s: %s\r\n", i, credits.credits[i].nickname, buffer);
     }
   }
-  cprintf("\r\nn) Neu d) Loeschen p) Einzahlen b) Seite hoch f) Seite "
-          "runter\r\ng) Filtern e) Aendern s) Speichern z) Zurueck\r\n");
+  cprintf("\r\nn) Neu d) L" oUML "schen p) Einzahlen b) Seite hoch "
+          "f) Seite runter\r\ng) Filtern e) " AUML "ndern s) Speichern "
+          "z) Zur" uUML "ck\r\n");
 }
 
 struct credits_t *find_credit(char *name) {
@@ -59,73 +62,58 @@ struct credits_t *find_credit(char *name) {
   return NULL;
 }
 
-/*
- * Deposits credit for a user. Called in the credit manager (with input ==
- * NULL) or interactively when the user does not have enough money for his
- * intended purchase (with input == nickname).
- *
- */
-void deposit_credit(char *input) {
+void deposit_credit(char *nickname) {
   char *time = get_time();
   struct credits_t *credit;
   unsigned int deposit;
 
-  if (input == NULL) {
-    cprintf("\r\nName:\r\n");
-    if ((input = get_input()) == NULL || *input == '\0')
-      return; // no name given
-  }
-
-  if ((credit = find_credit(input)) == NULL)
+  if ((credit = find_credit(nickname)) == NULL)
     return; // cannot find named credit
 
   cprintf("\r\nEinzahlung in Cent:\r\n");
-  if ((input = get_input()) == NULL || *input == '\0' ||
-      (deposit = atoi(input)) == 0)
+  if (cget_number(0) == 0)
     return;
 
   credit->credit += deposit;
 
   print_the_buffer();
-  cprintf("\r\nEinzahlung durchgefuehrt, druecke RETURN...\r\n");
-  input = get_input();
+  cprintf("\r\nEinzahlung durchgef" uUML "hrt, dr" uUML "cke RETURN...\r\n");
+  cget_return();
 }
 
 static void new_credit(void) {
-  char *input, *name;
+  char name[NICKNAME_MAX_LEN + 1];
   char *time;
   int credit;
 
-  if (credits.num_items == 75) {
-    cprintf("\rEs ist bereits die maximale Anzahl an Eintraegen erreicht, "
-            "druecke RETURN...\r\n");
-    input = get_input();
+  if (credits.num_items == MAX_CREDIT_ITEMS) {
+    cprintf("\rEs ist bereits die maximale Anzahl an Eintr" aUML
+            "gen erreicht, dr" uUML "cke RETURN...\r\n");
+    cget_return();
     return;
   }
 
   clrscr();
   cprintf("\rNickname (max. 10 Zeichen):\r\n");
-  if ((input = get_input()) == NULL || *input == '\0')
+  if (cgetn_input(name, sizeof(name)) == 0)
     return;
-  name = strdup(input);
+
   cprintf("\r\nGuthaben in Cents:\r\n");
-  if ((input = get_input()) == NULL || *input == '\0' ||
-      (credit = atoi(input)) == 0)
+  if ((credit = cget_number(0)) == 0)
     return;
   strncpy(credits.credits[credits.num_items].nickname, name, NICKNAME_MAX_LEN);
   credits.credits[credits.num_items].credit = credit;
 
   time = get_time();
-  sprintf(print_buffer, "%c%s - Guthaben mit %d Cent fuer %s angelegt\r", 17,
-          time, credit, name);
+  sprintf(print_buffer, "%c%s - Guthaben mit %d Cent f" uUML "r %s angelegt\r",
+          17, time, credit, name);
   print_the_buffer();
 
   credits.num_items++;
-  free(name);
 }
 
 static void _delete_credit(BYTE num) {
-  memset(credits.credits[num].nickname, '\0', 11);
+  memset(credits.credits[num].nickname, '\0', NICKNAME_MAX_LEN + 1);
   credits.credits[num].credit = 0;
 }
 
@@ -133,14 +121,15 @@ static void delete_credit(void) {
   char *input;
   BYTE num, last;
 
-  cprintf("\r Welcher Eintrag soll geloescht werden?\r\n");
+  cprintf("\r Welcher Eintrag soll gel" oUML "scht werden?\r\n");
   if ((input = get_input()) == NULL || *input == '\0')
     return;
   num = atoi(input);
   if (credits.num_items > 1) {
     /* Swap last item with this one and delete the last one to avoid holes */
     last = (credits.num_items - 1);
-    strcpy(credits.credits[num].nickname, credits.credits[last].nickname);
+    strncpy(credits.credits[num].nickname, credits.credits[last].nickname,
+            NICKNAME_MAX_LEN);
     credits.credits[num].credit = credits.credits[last].credit;
     _delete_credit(last);
   } else {
@@ -151,6 +140,7 @@ static void delete_credit(void) {
 }
 
 void credit_manager() {
+  char nickname[NICKNAME_MAX_LEN + 1];
   char *c;
   while (1) {
     credit_print_screen();
@@ -174,20 +164,23 @@ void credit_manager() {
         current_credits_page--;
       break;
     case 'p':
-      deposit_credit(NULL);
+      cputs("\rName?\r\n");
+      if (cgetn_input(nickname, sizeof(nickname)))
+        deposit_credit(nickname);
       break;
     case 'g':
       cprintf("Filter eingeben:\r\n");
       filter = get_input();
-      if (filter == NULL || *filter == 32 || (filter_len = strlen(filter)) == 0)
+      if (filter == NULL || *filter == PETSCII_SP ||
+          (filter_len = strlen(filter)) == 0)
         filter = NULL;
       break;
     case 'z':
       save_credits();
       return;
     default:
-      cprintf("Unbekannter Befehl, druecke RETURN...\r\n");
-      get_input();
+      cprintf("Unbekannter Befehl, dr" uUML "cke RETURN...\r\n");
+      cget_return();
     }
   }
 }