Changeset 82b71ef1 in mainline for kernel/generic/src/syscall/syscall.c

Timestamp:

2008-06-04T19:17:36Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

32443b0

Parents:

7ba289a

Message:

resurrect klog

File:

• kernel/generic/src/syscall/syscall.c (modified) (1 diff)

kernel/generic/src/syscall/syscall.c

@@ -64 +64 @@
         int rc;
 
-        if (count == 0)
-                return 0;
-
         if (count > PAGE_SIZE)
                 return ELIMIT;
-
-        data = (char *) malloc(count, 0);
-        if (!data)
-                return ENOMEM;
         
-        rc = copy_from_uspace(data, buf, count);
-        if (rc) {
+        if (count > 0) {
+                data = (char *) malloc(count, 0);
+                if (!data)
+                        return ENOMEM;
+                
+                rc = copy_from_uspace(data, buf, count);
+                if (rc) {
+                        free(data);
+                        return rc;
+                }
+        
+                for (i = 0; i < count; i++)
+                        putchar(data[i]);
                 free(data);
-                return rc;
-        }
-
-        for (i = 0; i < count; i++)
-                putchar(data[i]);
-        free(data);
+        } else
+                klog_update();
         
         return count;