Changes in uspace/app/bdsh/cmds/modules/cat/cat.c [8e3498b:39330200] in mainline

File:

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

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

@@ -187 +187 @@
         off64_t file_size = 0, length = 0;
         aoff64_t pos = 0;
-        int rc;
+        errno_t rc;
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
@@ -195 +195 @@
                 /* Allow storing the whole UTF-8 character. */
                 blen = STR_BOUNDS(1);
-        } else
-                fd = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ);
+        } else {
+                errno_t rc = vfs_lookup_open(fname, WALK_REGULAR, MODE_READ, &fd);
+                if (rc != EOK) {
+                        fd = -1;
+                }
+        }
         
         if (fd < 0) {
@@ -211 +215 @@
 
         if (tail != CAT_FULL_FILE) {
-                struct stat st;
+                vfs_stat_t st;
 
                 if (vfs_stat(fd, &st) != EOK) {
@@ -312 +316 @@
         bool tailFirst = false;
         sysarg_t rows, cols;
-        int rc;
+        errno_t rc;
         
         /*
@@ -324 +328 @@
         console_rows = 0;
         should_quit = false;
+        dash_represents_stdin = false;
         console = console_init(stdin, stdout);
         number = false;
@@ -334 +339 @@
 
         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
-                c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
+                c = getopt_long(argc, argv, "xhvmH:t:b:sn", long_options, &opt_ind);
                 switch (c) {
                 case 'h':