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

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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) (3 diffs)

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

@@ -33 +33 @@
 #include <unistd.h>
 #include <getopt.h>
-#include <string.h>
+#include <str.h>
 #include <fcntl.h>
 
@@ -43 +43 @@
 #include "cmds.h"
 
-static char *cmdname = "cat";
+static const char *cmdname = "cat";
 #define CAT_VERSION "0.0.1"
 #define CAT_DEFAULT_BUFLEN 1024
 
-static char *cat_oops = "That option is not yet supported\n";
+static const char *cat_oops = "That option is not yet supported\n";
 
 static struct option const long_options[] = {
@@ -85 +85 @@
 {
         int fd, bytes = 0, count = 0, reads = 0;
-        off_t total = 0;
+        off64_t total = 0;
         char *buff = NULL;