Changeset 6c69d19 in mainline for uspace/lib/posix/unistd.c

Timestamp:

2011-07-25T20:34:17Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

00c2de63, c936c7f

Parents:

5889fc74 (diff), d542aad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge libposix.

File:

• uspace/lib/posix/unistd.c (modified) (5 diffs)

uspace/lib/posix/unistd.c

@@ -31 +31 @@
  * @{
  */
-/** @file
+/** @file Miscellaneous standard definitions.
  */
 
@@ -90 +90 @@
         /* Always returns false, because there is no easy way to find
          * out under HelenOS. */
-        return false;
+        return 0;
 }
 
@@ -207 +207 @@
                 /* Check file existence by attempt to open it. */
                 int fd = open(path, O_RDONLY);
-                if (fd < 0) {
-                        /* FIXME: open() returns error code as negative retval. */
-                        errno = -fd;
-                        fd = -1;
-                } else {
+                if (fd != -1) {
                         close(fd);
                 }
@@ -239 +235 @@
                 clk_tck = ((long) cpu_stats[0].frequency_mhz) * 1000000L;
         }
-        free(cpu_stats);
-        cpu_stats = 0;
+        if (cpu_stats) {
+                free(cpu_stats);
+                cpu_stats = 0;
+        }
 
         long phys_pages = 0;
@@ -248 +246 @@
                 phys_pages = (long) (mem_stats->total / getpagesize());
                 avphys_pages = (long) (mem_stats->free / getpagesize());
-        }
-        free(mem_stats);
-        mem_stats = 0;
+                free(mem_stats);
+                mem_stats = 0;
+        }
 
         switch (name) {