From 8fa851ddb610e5fbed9a1831b8bdbf88eb7852f3 Mon Sep 17 00:00:00 2001
From: turbocat <turbocat@kolibrios.org>
Date: Sat, 24 Jul 2021 21:28:39 +0000
Subject: [PATCH] =?UTF-8?q?libc.obj:=20strtol.=D1=81=20=20-=20removed=20ex?=
 =?UTF-8?q?isting=20definitions;=20fgets.c=20-=20uses=20fread()=20to=20rea?=
 =?UTF-8?q?d;=20gets.c=20=20-=20added=20additional=20check;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://kolibrios.org@9081 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 .../develop/ktcc/trunk/libc.obj/source/stdio/fgets.c   | 10 ++--------
 .../develop/ktcc/trunk/libc.obj/source/stdio/gets.c    |  8 ++++++--
 .../develop/ktcc/trunk/libc.obj/source/stdlib/strtol.c |  5 -----
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/programs/develop/ktcc/trunk/libc.obj/source/stdio/fgets.c b/programs/develop/ktcc/trunk/libc.obj/source/stdio/fgets.c
index 300ae09f7d..89f99e9c54 100644
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/fgets.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/fgets.c
@@ -11,14 +11,8 @@ char *fgets(char *str, int n, FILE *stream)
         return NULL;
     }
     
-    while (i<n-1){
-        sym_code = fgetc(stream);
-        if(sym_code =='\n' || sym_code == EOF){ break; }
-        str[i]=(char)sym_code;
-        i++;
-    }
-    
+    i = fread(str, n-1, sizeof(char), stream);
     if(i<1){ return NULL; }
     return str;
 }
-    
\ No newline at end of file
+    
diff --git a/programs/develop/ktcc/trunk/libc.obj/source/stdio/gets.c b/programs/develop/ktcc/trunk/libc.obj/source/stdio/gets.c
index f1b79eb25e..95edf7c052 100644
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdio/gets.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdio/gets.c
@@ -11,6 +11,10 @@ char *gets(char* str)
         errno = EIO;
         return NULL;
     }
-    str[strlen(str)-1]='\0';
+    
+    int str_len = strlen(str);
+    if(str[str_len-1]=='\n'){
+        str[str_len-1]='\0';
+    }
     return str;
-}
\ No newline at end of file
+}
diff --git a/programs/develop/ktcc/trunk/libc.obj/source/stdlib/strtol.c b/programs/develop/ktcc/trunk/libc.obj/source/stdlib/strtol.c
index a9141520e3..eb6738e79b 100644
--- a/programs/develop/ktcc/trunk/libc.obj/source/stdlib/strtol.c
+++ b/programs/develop/ktcc/trunk/libc.obj/source/stdlib/strtol.c
@@ -2,11 +2,6 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#define LONG_MIN (-2147483647L-1)
-#define LONG_MAX (2147483647L)
-#define ULONG_MAX (4294967295UL)
-
-
 int getdigit(char ch, int base)
 {
 	if (isdigit(ch)) ch-= '0';