From 45584a1c39c699e2bc68638fe2402e590631e3a3 Mon Sep 17 00:00:00 2001
From: jvech <jmvalenciae@unal.edu.co>
Date: Mon, 31 Oct 2022 10:35:24 -0500
Subject: fix: stdin file reading bug fixed

Because is impossible to look for a mtl file it will discard it and
prints a warning message
---
 src/obj.c | 26 ++++++++++++++++++--------
 src/obj.h |  4 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/obj.c b/src/obj.c
index 7d65722..5554b46 100644
--- a/src/obj.c
+++ b/src/obj.c
@@ -64,7 +64,7 @@ objCreate(const char *filename)
     Obj o;
     Mesh *mesh;
     Material *mtl;
-    char lineBuffer[OBJ_LINE_MAX_SIZE]; 
+    char lineBuffer[OBJ_LINE_MAX];
     FILE *fi;
 
     struct Setv3 *v, *vn;
@@ -97,7 +97,7 @@ objCreate(const char *filename)
     int mtlSize, mtlIndex, meshIndex;
     vIndex = vtIndex = vnIndex = meshIndex = mtlSize = 0;
 
-    while (fgets(lineBuffer, OBJ_LINE_MAX_SIZE, fi)) {
+    while (fgets(lineBuffer, OBJ_LINE_MAX, fi)) {
 
         sscanf(lineBuffer, "%s%n", key, &n);
 
@@ -351,7 +351,7 @@ Material *
 readMtl(char *line, const char *objFile, int *size)
 {
     Material *out;
-    char buffer[OBJ_LINE_MAX_SIZE], mtlFilename[OBJ_LINE_MAX_SIZE], key[OBJ_MAX_WORD];
+    char buffer[OBJ_LINE_MAX], mtlFilename[OBJ_LINE_MAX], key[OBJ_MAX_WORD];
     char path[OBJ_MAX_WORD], fileName[OBJ_MAX_WORD];
     FILE *fin;
     int i, n;
@@ -362,8 +362,18 @@ readMtl(char *line, const char *objFile, int *size)
     sprintf(mtlFilename, "%s/%s", path, fileName);
 
     fin = fopen(mtlFilename, "r");
+
+    if (fin == NULL && errno == ENOENT) {
+        perror("readMtl() Warning");
+        if (size) *size = 0;
+        return NULL;
+    } else if (fin == NULL) {
+        perror("readMtl() Error");
+        exit(1);
+    }
+
     i = 0;
-    while(fgets(buffer, OBJ_LINE_MAX_SIZE, fin)) {
+    while(fgets(buffer, OBJ_LINE_MAX, fin)) {
         sscanf(buffer, "%s%n", key, &n);
         if  (!strcmp(key, "newmtl")) appendMtl(buffer + n, &out, i++);
         if (i > 0) {
@@ -384,7 +394,7 @@ readMtl(char *line, const char *objFile, int *size)
 void
 appendMtl(char *line, Material **mtl, int index)
 {
-    char name[OBJ_LINE_MAX_SIZE];
+    char name[OBJ_LINE_MAX];
 
     if (index == 0)
         *mtl = (Material *)calloc(1, sizeof(Material));
@@ -392,10 +402,10 @@ appendMtl(char *line, Material **mtl, int index)
         *mtl = (Material *)realloc(*mtl, (index + 1) * sizeof(Material));
 
     sscanf(line, "%s", name);
-    strncpy((*mtl + index)->name, name, OBJ_LINE_MAX_SIZE);
+    strncpy((*mtl + index)->name, name, OBJ_LINE_MAX);
 
     if (mtl == NULL) {
-        fprintf(stderr, "appendMtl() Error: %s\n", strerror(errno));
+        perror("appendMtl() Error");
         exit(1);
     }
 }
@@ -422,7 +432,7 @@ unsigned int
 useMtl(char *line, Material *mtl, unsigned int size)
 {
     int i;
-    char name[OBJ_LINE_MAX_SIZE];
+    char name[OBJ_LINE_MAX];
     for (i = 0; i < size; i++) {
         sscanf(line, "%s", name);
         if (!strcmp(name, mtl[i].name))
diff --git a/src/obj.h b/src/obj.h
index 44790a2..10df760 100644
--- a/src/obj.h
+++ b/src/obj.h
@@ -19,7 +19,7 @@
 # ifndef __OBJ__
 #define __OBJ__
 
-#define OBJ_LINE_MAX_SIZE 1024
+#define OBJ_LINE_MAX 1024
 #define OBJ_MAX_WORD 512
 
 typedef struct {
@@ -34,7 +34,7 @@ typedef struct {
 } Texture;
 
 typedef struct {
-    char name[OBJ_LINE_MAX_SIZE];
+    char name[OBJ_LINE_MAX];
     float ka[3], kd[3], ks[3];
     unsigned int illum;
     float ns;
-- 
cgit v1.2.3-70-g09d2