Skip to content

Commit

Permalink
<Libc> Add support for scanf to accept formatted
Browse files Browse the repository at this point in the history
modified:   src/lib/libc/scanf.c

bug fix for #289 (comment)

- removed usage of macros #289 (comment)
- removed buffer overflow condition #289 (comment)
- variable decalaration in new line #289 (comment)

Issue: #289
  • Loading branch information
sagarladla committed May 25, 2024
1 parent 9ad418a commit 7fd1894
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions src/lib/libc/scanf.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ char getchar()
* @brief This function will take string input with spaces
*
*/
char *gets()
char *gets(char *str)
{
char *s = (char *)malloc(sizeof(char)), temp;
int i = 0;
char *p = str;
char temp;
do
{
temp = getch();
Expand All @@ -66,10 +66,11 @@ char *gets()
}
else
{
s[i++] = temp;
*str++ = temp;
}
} while(temp != '\r');
return s;
str = '\0';
return p;
}

/**
Expand All @@ -80,8 +81,6 @@ char *gets()
*
*/

#define CURRCHAR (temp)
#define CHARIN() (temp = getch())
int scanf(const char * restrict fmt, ...)
{
unsigned int count = 0;
Expand All @@ -105,19 +104,19 @@ int scanf(const char * restrict fmt, ...)
case 'c':
{
/* skip leading spaces */
while (isSpace(CHARIN()))
while (isSpace(temp = getch()))
{
if (CURRCHAR == '\r')
if (temp == '\r')
fputc(stdout, '\n');
else
fputc(stdout, CURRCHAR);
fputc(stdout, temp);
}
fputc(stdout, CURRCHAR);
c = CURRCHAR;
while (CHARIN())
fputc(stdout, temp);
c = temp;
while ((temp = getch()))
{
fputc(stdout, CURRCHAR);
if (isSpace(CURRCHAR))
fputc(stdout, temp);
if (isSpace(temp))
break;
}
fputc(stdout, '\n');
Expand All @@ -129,21 +128,21 @@ int scanf(const char * restrict fmt, ...)
{
char *s = va_arg(ap, char *);
/* skip leading spaces */
while (isSpace(CHARIN()))
while (isSpace(temp = getch()))
{
if (CURRCHAR == '\r')
if (temp == '\r')
fputc(stdout, '\n');
else
fputc(stdout, CURRCHAR);
fputc(stdout, temp);
}
fputc(stdout, CURRCHAR);
*s++ = CURRCHAR;
while (CHARIN())
fputc(stdout, temp);
*s++ = temp;
while ((temp = getch()))
{
fputc(stdout, CURRCHAR);
if (isSpace(CURRCHAR))
fputc(stdout, temp);
if (isSpace(temp))
break;
*s++ = CURRCHAR;
*s++ = temp;
}
fputc(stdout, '\n');
*s = '\0';
Expand All @@ -155,26 +154,26 @@ int scanf(const char * restrict fmt, ...)
{
int a = 0;
/* skip leading spaces */
while (isSpace(CHARIN()))
while (isSpace(temp = getch()))
{
if (CURRCHAR == '\r')
if (temp == '\r')
fputc(stdout, '\n');
else
fputc(stdout, CURRCHAR);
fputc(stdout, temp);
}
fputc(stdout, CURRCHAR);
c = CURRCHAR;
while (CHARIN())
fputc(stdout, temp);
c = temp;
while ((temp = getch()))
{
a *= 10;
if (isDigit(c))
a += (c - '0');
else
a += (int)c;
if (isSpace(CURRCHAR))
if (isSpace(temp))
break;
c = CURRCHAR;
fputc(stdout, CURRCHAR);
c = temp;
fputc(stdout, temp);
}
fputc(stdout, '\n');
*(int *)va_arg(ap, int *) = a;
Expand All @@ -183,8 +182,9 @@ int scanf(const char * restrict fmt, ...)
}
case 'f':
{
char *a = gets();
*(float *)va_arg(ap, float *) = (float)atof(a);
char buff[50];
gets(buff);
*(float *)va_arg(ap, float *) = (float)atof(buff);
count++;
break;
}
Expand Down

0 comments on commit 7fd1894

Please sign in to comment.