Changeset 8436590 in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2011-04-07T21:38:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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 mainline changes.

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -164 +164 @@
 {
         int fd, bytes = 0, count = 0, reads = 0;
-        off64_t total = 0;
         char *buff = NULL;
         int i;
@@ -174 +173 @@
                 return 1;
         }
-
-        total = lseek(fd, 0, SEEK_END);
-        lseek(fd, 0, SEEK_SET);
 
         if (NULL == (buff = (char *) malloc(blen + 1))) {
@@ -199 +195 @@
                                         wchar_t c = str_decode(buff, &offset, bytes);
                                         if (c == 0) {
-                                                // reached end of string
+                                                /* Reached end of string */
                                                 break;
                                         }
@@ -232 +228 @@
         int rc;
         
-        // reset global state
-        // TODO: move to structure?
+        /*
+         * reset global state
+         * TODO: move to structure?
+         */
         paging_enabled = false;
         chars_remaining = 0;