Changeset bc73be3 in mainline for uspace/app/bdsh/cmds/modules/ls/ls.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• uspace/app/bdsh/cmds/modules/ls/ls.h (modified) (2 diffs)

uspace/app/bdsh/cmds/modules/ls/ls.h

@@ -8 +8 @@
 #define LS_FILE  1
 #define LS_DIR   2
-
-typedef struct {
-        /* Options set at runtime. */
-        unsigned int recursive;
-        unsigned int sort;
-
-} ls_job_t;
 
 /** Structure to represent a directory entry.
@@ -26 +19 @@
 };
 
+typedef struct {
+        /* Options set at runtime. */
+        unsigned int recursive;
+        unsigned int sort;
+
+        bool single_column;
+        bool exact_size;
+
+        errno_t (*printer)(struct dir_elem_t *);
+} ls_job_t;
+
 #endif