Changeset b828907 in mainline for uspace/app

Timestamp:

2012-07-20T20:29:54Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

34bc2fe

Parents:

4cdac68 (diff), 6de2d766 (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 with mainline

Location:

uspace/app

Files:

• bdsh/cmds/modules/cat/cat.c (modified) (4 diffs)
• usbinfo/Makefile (modified) (1 diff)
• usbinfo/list.c (moved) (moved from uspace/app/lsusb/main.c ) (5 diffs)
• usbinfo/main.c (modified) (7 diffs)
• usbinfo/usbinfo.h (modified) (1 diff)

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

@@ -176 +176 @@
 
         bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0);
-
+        
         if (reading_stdin) {
                 fd = fileno(stdin);
                 /* Allow storing the whole UTF-8 character. */
                 blen = STR_BOUNDS(1);
-        } else {
+        } else
                 fd = open(fname, O_RDONLY);
-        }
+        
         if (fd < 0) {
                 printf("Unable to open %s\n", fname);
@@ -222 +222 @@
                         bytes_to_read = 1;
                 } else {
-                        if ((length != CAT_FULL_FILE)
-                            && (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
+                        if ((length != CAT_FULL_FILE) &&
+                            (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) {
                                 bytes_to_read = (size_t) (length - count);
                         } else {
@@ -229 +229 @@
                         }
                 }
+                
                 bytes = read(fd, buff + copied_bytes, bytes_to_read);
                 bytes += copied_bytes;
@@ -261 +262 @@
                         reads++;
                 }
-
-                if (reading_stdin) {
+                
+                if (reading_stdin)
                         fflush(stdout);
-                }
         } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE));
 

uspace/app/usbinfo/Makefile

@@ -47 +47 @@
         hid.c \
         info.c \
+        list.c \
         main.c
 

uspace/app/usbinfo/list.c

@@ -47 +47 @@
 #include <usb/hc.h>
 
-#define NAME "lsusb"
+#include "usbinfo.h"
 
 #define MAX_USB_ADDRESS USB11_ADDRESS_MAX
@@ -90 +90 @@
 }
 
-int main(int argc, char *argv[])
+void list(void)
 {
         category_id_t usbhc_cat;
@@ -102 +102 @@
                 printf(NAME ": Error resolving category '%s'",
                     USB_HC_CATEGORY);
-                return 1;
+                return;
         }
 
@@ -108 +108 @@
         if (rc != EOK) {
                 printf(NAME ": Error getting list of host controllers.\n");
-                return 1;
+                return;
         }
 
@@ -131 +131 @@
 
         free(svcs);
-
-        return 0;
 }
 

uspace/app/usbinfo/main.c

@@ -62 +62 @@
 
         _OPTION("-h --help", "Print this help and exit.");
+        _OPTION("-l --list", "Print a list of host controllers and devices.");
         _OPTION("-i --identification", "Brief device identification.");
         _OPTION("-m --match-ids", "Print match ids generated for the device.");
@@ -82 +83 @@
         {"help", no_argument, NULL, 'h'},
         {"identification", no_argument, NULL, 'i'},
+        {"list", no_argument, NULL, 'l'},
         {"match-ids", no_argument, NULL, 'm'},
         {"descriptor-tree", no_argument, NULL, 't'},
@@ -91 +93 @@
         {0, 0, NULL, 0}
 };
-static const char *short_options = "himtTsSrR";
+static const char *short_options = "hilmtTsSrR";
 
 static usbinfo_action_t actions[] = {
@@ -146 +148 @@
         }
 
+        bool something_active = false;
         /*
          * Process command-line options. They determine what shall be
@@ -156 +159 @@
                 switch (opt) {
                         case -1:
+                                break;
+                        case 'l':
+                                list();
                                 break;
                         case '?':
@@ -168 +174 @@
                                         if (actions[idx].opt == opt) {
                                                 actions[idx].active = true;
+                                                something_active = true;
                                                 break;
                                         }
@@ -178 +185 @@
 
         /* Set the default action. */
-        int idx = 0;
-        bool something_active = false;
-        while (actions[idx].opt != 0) {
-                if (actions[idx].active) {
-                        something_active = true;
-                        break;
-                }
-                idx++;
-        }
         if (!something_active) {
                 actions[0].active = true;

uspace/app/usbinfo/usbinfo.h

@@ -79 +79 @@
     dump_descriptor_in_tree_t, size_t, void *);
 
+void list(void);
 
 void dump_short_device_identification(usbinfo_device_t *);