From 0ed434d9d215f5c02351da07b05192aba439a22f Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Fri, 22 Apr 2011 04:47:04 +0200
Subject: [PATCH] code done

---
 Makefile |  6 +++---
 brmbar.c |  3 ++-
 dataio.c | 18 +++++++++++-------
 dataio.h |  1 -
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index c68511f..25213c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
 CC=bcc
 CFLAGS=-Md -W
 
-all: brmbar.c defines.h
-	gcc -Wall brmbar.c -o brmbar
-	bcc -Md -W brmbar.c -o brmbar.com
+all: brmbar.c
+#	gcc brmbar.c dataio.c -o brmbar
+	bcc -Md -W brmbar.c dataio.c -o brmbar.com
 
 clean:
 	rm -f brmbar.com brmbar
diff --git a/brmbar.c b/brmbar.c
index 9821fce..d24bfbd 100644
--- a/brmbar.c
+++ b/brmbar.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include "dataio.h"
 
 #define EAN_MAXLEN 32
 #define NAME_MAXLEN 128
@@ -95,7 +96,7 @@ void read_input()
 
     // scan items
     for (i = 0; i < items_count; ++i) {
-        if (!strncmp(buf, items[i].ean, strlen(items[i].ean))) {
+        if (!strncmp(buf, items[i].ean, strlen(items[i].ean)) && strlen(items[i].ean)+1 == strlen(buf)) {
             if (items[i].price) {
                 last_item = i;
                 printf("\n%s    %d Kc\n\n", items[i].name, items[i].price);
diff --git a/dataio.c b/dataio.c
index ff28cf4..7b50394 100644
--- a/dataio.c
+++ b/dataio.c
@@ -6,19 +6,24 @@ int modify_credit(name, price)
     const char* name;
     int price;
 {
-    char filename[13];
+    char filename[20];
     int i;
     int credit;
     FILE* person_data;
 
-    strncpy(filename, name, 8);
-    i = strlen(name);
-    if (i > 8) i = 8;
+    strcpy(filename, "DATA\\");
+    i = 5;
+    strncpy(&filename[i], name, 8);
+    if (strlen(name) > 8) {
+        i += 8;
+    } else {
+        i += strlen(name);
+    }
     strcpy(&filename[i], ".txt");
     person_data = fopen(filename, "r");
 
     if (person_data == NULL) {
-        printf("Warning: Filename %s does not exist!\n", filename);
+//        printf("Warning: Filename %s does not exist!\n", filename);
         credit = 0;
     } else {
         fscanf(person_data, "%i", &credit);
@@ -30,7 +35,7 @@ int modify_credit(name, price)
         credit += price;
         person_data = fopen(filename, "w");
         if (person_data == NULL) {
-            printf("ERROR: Filename %s could not be created or overwritten!\nCheck system integrity!\n", filename);
+//            printf("ERROR: Filename %s could not be created or overwritten!\nCheck system integrity!\n", filename);
         } else {
             fprintf(person_data, "%i", credit);
             fclose(person_data);
@@ -39,4 +44,3 @@ int modify_credit(name, price)
 
     return credit;
 }
-
diff --git a/dataio.h b/dataio.h
index 3e7d340..61a243d 100644
--- a/dataio.h
+++ b/dataio.h
@@ -4,4 +4,3 @@
 extern int modify_credit(name, price);
 
 #endif
-