summaryrefslogtreecommitdiff
path: root/src/user
diff options
context:
space:
mode:
authorBenji Dial <benji6283@gmail.com>2021-02-17 17:59:05 -0500
committerBenji Dial <benji6283@gmail.com>2021-02-17 17:59:05 -0500
commit79973061600a2af480c4f8ec1e1e71846985b653 (patch)
treef63a54b5116bd19e2f82b14261c65584d80407f5 /src/user
parent302666775a00b1df398ca06b97aa481a6626045d (diff)
downloadportland-os-79973061600a2af480c4f8ec1e1e71846985b653.tar.gz
dirlist program, making fat refuse to list file as directory
Diffstat (limited to 'src/user')
-rw-r--r--src/user/dirlist/main.c27
-rw-r--r--src/user/include/knob/block.h6
-rw-r--r--src/user/knob/block.c16
3 files changed, 49 insertions, 0 deletions
diff --git a/src/user/dirlist/main.c b/src/user/dirlist/main.c
new file mode 100644
index 0000000..64f0ddb
--- /dev/null
+++ b/src/user/dirlist/main.c
@@ -0,0 +1,27 @@
+#include <libterm/terminal.h>
+#include <knob/block.h>
+#include <knob/file.h>
+
+#define MAX_NAME_LEN 15
+#define COLUMN_SEP " - "
+
+void main(const char *path) {
+ uint32_t count;
+ _dir_info_entry_t *entries = get_directory_info(path, &count);
+ if (!entries) {
+ term_addf("Could not list %s\n", path);
+ return;
+ }
+ term_addf("Directory listing for %s:\n\n", *path ? path : "(root)");
+ if (!count) {
+ term_add_sz("(empty)\n");
+ return;
+ }
+ for (_dir_info_entry_t *i = entries; i < entries + count; ++i) {
+ str_trunc_fill(i->name, MAX_NAME_LEN);
+ if (i->is_dir)
+ term_addf_no_ww("%s" COLUMN_SEP "directory\n", i->name);
+ else
+ term_addf_no_ww("%s" COLUMN_SEP "%u bytes\n", i->name, i->size);
+ }
+} \ No newline at end of file
diff --git a/src/user/include/knob/block.h b/src/user/include/knob/block.h
index f77709d..1231a6d 100644
--- a/src/user/include/knob/block.h
+++ b/src/user/include/knob/block.h
@@ -18,4 +18,10 @@ uint32_t strlen(const char *str) __attribute__ ((pure));
bool strequ(const char *a, const char *b) __attribute__ ((pure));
+//if str has length == len, nothing is done
+//if str has length < len, it is right-padded with spaces
+//if str has length > len, the end is replaced with " ..."
+//this replacement happens in place, with no memory allocation
+void str_trunc_fill(char *str, uint32_t len);
+
#endif \ No newline at end of file
diff --git a/src/user/knob/block.c b/src/user/knob/block.c
index 90f79e3..1720f94 100644
--- a/src/user/knob/block.c
+++ b/src/user/knob/block.c
@@ -57,4 +57,20 @@ uint32_t strlen(const char *str) {
++str;
}
return len;
+}
+
+void str_trunc_fill(char *str, uint32_t len) {
+ const uint8_t orig_len = strlen(str);
+ if (orig_len > len) {
+ str[len - 4] = ' ';
+ str[len - 3] = '.';
+ str[len - 2] = '.';
+ str[len - 1] = '.';
+ str[len] = '\0';
+ }
+ else if (orig_len != len) {
+ for (uint8_t j = orig_len; j < len; ++j)
+ str[j] = ' ';
+ str[len] = '\0';
+ }
} \ No newline at end of file