Changeset 69612 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Nov 8, 2017 12:09:43 PM (7 years ago)

Author:

vboxsync

Message:

Touched up test code.

Location:

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/test

Files:

• fsw_posix.c (modified) (4 diffs)
• fsw_posix.h (modified) (3 diffs)
• lslr.c (modified) (3 diffs)
• lsroot.c (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/test/fsw_posix.c

@@ -85 +85 @@
 
     // open underlying file/device
-    pvol->fd = open(path, O_RDONLY, 0);
+    pvol->fd = open(path, O_RDONLY | O_BINARY, 0);
     if (pvol->fd < 0) {
         fprintf(stderr, "fsw_posix_mount: %s: %s\n", path, strerror(errno));
@@ -226 +226 @@
  */
 
-struct dirent * fsw_posix_readdir(struct fsw_posix_dir *dir)
-{
-    fsw_status_t        status;
-    struct fsw_dnode    *dno;
-    static struct dirent dent;
+struct fsw_posix_dirent * fsw_posix_readdir(struct fsw_posix_dir *dir)
+{
+    fsw_status_t                    status;
+    struct fsw_dnode                *dno;
+    static struct fsw_posix_dirent  dent;
 
     // get next entry from file system
@@ -248 +248 @@
     // fill dirent structure
     dent.d_fileno = dno->dnode_id;
-    dent.d_reclen = 8 + dno->name.size + 1;
+    //dent.d_reclen = 8 + dno->name.size + 1;
     switch (dno->type) {
         case FSW_DNODE_TYPE_FILE:
@@ -374 +374 @@
     block_offset = (off_t)phys_bno * vol->phys_blocksize;
     seek_result = lseek(pvol->fd, block_offset, SEEK_SET);
-    if (seek_result != block_offset)
+    if (seek_result != block_offset) {
+        fprintf(stderr, "fsw_posix_read_block: failed to seek to block %u (offset %u)\n", phys_bno, block_offset);
         return FSW_IO_ERROR;
+    }
     read_result = read(pvol->fd, buffer, vol->phys_blocksize);
-    if (read_result != vol->phys_blocksize)
+    if (read_result != vol->phys_blocksize) {
+        fprintf(stderr, "fsw_posix_read_block: failed to read %u bytes at %u\n", vol->phys_blocksize, block_offset);
         return FSW_IO_ERROR;
+    }
 
     return FSW_SUCCESS;

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/test/fsw_posix.h

@@ -43 +43 @@
 #include <fcntl.h>
 #include <sys/types.h>
-#include <sys/dir.h>
 
 
@@ -80 +79 @@
 
 
+#define NAME_MAX    4096
+
+#define DT_UNKNOWN  'u'
+#define DT_REG      'r'
+#define DT_DIR      'd'
+#define DT_LNK      'l'
+
+
+/**
+ * POSIX Host: Private structure for an open directory.
+ */
+
+struct fsw_posix_dirent {
+    char                d_attr;             /* file's attribute */
+    unsigned            d_type;
+    unsigned short int  d_time;             /* file's time */
+    unsigned short int  d_date;             /* file's date */
+    long                d_size;             /* file's size */
+    char                d_name[NAME_MAX+1]; /* file's name */
+    unsigned            d_fileno;           /* file number/inode */
+};
+typedef struct fsw_posix_dirent DIR;
+
 /* functions */
 
@@ -91 +113 @@
 
 struct fsw_posix_dir * fsw_posix_opendir(struct fsw_posix_volume *pvol, const char *path);
-struct dirent * fsw_posix_readdir(struct fsw_posix_dir *dir);
+struct fsw_posix_dirent * fsw_posix_readdir(struct fsw_posix_dir *dir);
 void fsw_posix_rewinddir(struct fsw_posix_dir *dir);
 int fsw_posix_closedir(struct fsw_posix_dir *dir);

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/test/lslr.c

@@ -53 +53 @@
 {
     struct fsw_posix_dir *dir;
-    struct dirent *dent;
+    struct fsw_posix_dirent *dent;
     int i;
     char subpath[4096];
@@ -65 +65 @@
         for (i = 0; i < level*2; i++)
             fputc(' ', stdout);
-        printf("%d  %s\n", dent->d_type, dent->d_name);
+        printf("%c  %s\n", dent->d_type, dent->d_name);
 
         if (dent->d_type == DT_DIR) {
@@ -123 +123 @@
     }
 
-    //listdir(vol, "/System/Library/Extensions/udf.kext/", 0);
+    listdir(vol, "/System/Library/CoreServices", 0);
     //listdir(vol, "/System/Library/Extensions/AppleACPIPlatform.kext/", 0);
     //listdir(vol, "/System/Library/Extensions/", 0);
-    catfile(vol, "/System/Library/Extensions/AppleHPET.kext/Contents/Info.plist");
+    catfile(vol, "/System/Library/CoreServices/SystemVersion.plist");
     //listdir(vol, "/", 0);
 

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/test/lsroot.c

@@ -48 +48 @@
     struct fsw_posix_volume *vol;
     struct fsw_posix_dir *dir;
-    struct dirent *dent;
+    struct fsw_posix_dirent *dent;
 
-    if (argc != 2) {
-        printf("Usage: lsroot <file/device>\n");
+    if (argc != 3) {
+        printf("Usage: lsroot <file/device> <directory>\n");
         return 1;
     }
@@ -63 +63 @@
     }
     //dir = fsw_posix_opendir(vol, "/drivers/net/");
-    dir = fsw_posix_opendir(vol, "/");
+    dir = fsw_posix_opendir(vol, argv[2]);
     if (dir == NULL) {
         printf("opendir call failed.\n");
@@ -69 +69 @@
     }
     while ((dent = fsw_posix_readdir(dir)) != NULL) {
-        printf("- %s\n", dent->d_name);
+        printf("%c %s\n", dent->d_type, dent->d_name);
     }
     fsw_posix_closedir(dir);