Changeset 677 for trunk/libs/mini-libc/stdio.c

Timestamp:

Nov 20, 2020, 12:18:00 AM (3 years ago)

Author:

alain

Message:

Introduce the fgetc() and fputc() functions.

File:

• trunk/libs/mini-libc/stdio.c (modified) (8 diffs)

trunk/libs/mini-libc/stdio.c

@@ -35 +35 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
-// This user space array registers all FILE descriptors open by a given process
-FILE open_file_array[MAX_OPEN_FILE_PER_PROCESS];  // array of open files structures
+// This user space array registers all FILE descriptors that can be simultaneously
+// open by a given process. The structure FILE is defined in the <stdio.h> file. 
+
+FILE open_file_array[MAX_OPEN_FILE_PER_PROCESS];  
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -139 +141 @@
                 break;
             }
-            case ('x'):             // 32 bits hexadecimal 
-            case ('l'):             // 64 bits hexadecimal 
-            {
-                unsigned int       imax;
-                unsigned long long val;
-                
-                if ( *format == 'l' )   // 64 bits
-                {
-                    val = va_arg( *args, unsigned long long);
-                    imax = 16;
-                }
-                else                    // 32 bits
-                {
-                    val = va_arg( *args, unsigned int);
-                    imax = 8;
-                }
-                
+            case ('x'):             // up to 8 digits hexa after "0x"
+            case ('X'):             // exactly 8 digits hexa after "0x"
+            {
+                unsigned int val = va_arg( *args , unsigned int );
                 TO_STREAM( '0' );
                 TO_STREAM( 'x' );
-                
-                for(i = 0; i < imax; i++) 
-                {
-                    buf[(imax-1) - i] = HexaTab[val % 16];
-                    if (!(val /= 16))  break;
+                for(i = 0 ; i < 8 ; i++) 
+                {
+                    buf[7 - i] = HexaTab[val & 0xF];
+                    if( (*format == 'x') && ((val >> 4) == 0) )  break;
+                    val = val >> 4;
                 }
                 len =  i + 1;
-                pbuf = &buf[(imax-1) - i];
+                pbuf = &buf[7 - i];
+                break;
+            }
+            case ('l'):             // up to 16 digits hexa after "0x"
+            case ('L'):             // exactly 16 digits hexa after "0x"
+            {
+                unsigned long long val = ((unsigned long long)va_arg( *args, unsigned int)) |
+                                         ((unsigned long long)va_arg( *args, unsigned int) << 32);
+                TO_STREAM( '0' );
+                TO_STREAM( 'x' );
+                for(i = 0 ; i < 16 ; i++) 
+                {
+                    buf[15 - i] = HexaTab[val & 0xF];
+                    if( (*format == 'l') && ((val >> 4) == 0) )  break;
+                    val = val >> 4;
+                }
+                len =  i + 1;
+                pbuf = &buf[15 - i];
                 break;
             }
             case ('s'):             /* string */
             {
-                char* str = va_arg( *args, char* );
+                char * str = va_arg( *args , char* );
                 while (str[len]) { len++; }
                 pbuf = str;
@@ -272 +278 @@
         format++;
 
-        // copy argument to string
+        // copy argument sub-string to the string buffer
         for( i = 0 ; i < len ; i++ )
         {
@@ -285 +291 @@
 int printf( const char * format, ... )
 {
-    char               string[4096];
-    va_list            args;
-    unsigned int       count;
+    char      string[4096];
+    va_list   args;
+    int       count;
     
     va_start( args, format );
@@ -293 +299 @@
     va_end( args );
 
-    if ( count == 0xFFFFFFFF ) 
+    if ( count < 0 ) 
     {
         display_string( "printf : xprintf failure" );
@@ -329 +335 @@
               const char     * format, ... )
 {
-    va_list            args;
-    unsigned int       count;
+    va_list   args;
+    int       count;
 
     va_start( args, format );
@@ -336 +342 @@
     va_end( args );
 
-    if( count < length ) string[count] = 0;
-
-    return count;
+    if( (count < 0) || (count == (int)length) )  // failure 
+    {
+        return -1;
+    }
+    else                                        // success
+    {
+        // add NUL character
+        string[count] = 0;
+
+        return count;
+    }
 }  // end snprintf()
+
+
+
+
 
 ////////////////////////////////////
@@ -398 +416 @@
 
 }  // end fclose()
+
+//////////////////////////
+int fgetc( FILE * stream )
+{
+    // check stream valid
+    if( stream->key != VALID_OPEN_FILE ) return EOF;
+
+    // get file descriptor from stream pointer
+    int fd = stream->fd;
+
+    char byte;
+
+    if ( read( fd , &byte , 1 ) != 1 ) return 0;
+    else                               return (int)byte; 
+
+}
+
+/////////////////
+int fputc( int c, 
+           FILE * stream)
+{
+    // check stream valid
+    if( stream->key != VALID_OPEN_FILE ) return EOF;
+
+    // get file descriptor from stream pointer
+    int fd = stream->fd;
+
+    char byte = (char)c;
+
+    if( write( fd , &byte , 1 ) != 1 ) return 0;
+    else                               return c; 
+
+}
 
 //////////////////////////////////////////