Changeset 8e7c9fe in mainline for uspace/app/bdsh

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:

uspace/app/bdsh

Files:

• compl.c (modified) (2 diffs)
• exec.c (modified) (3 diffs)

uspace/app/bdsh/compl.c

@@ -209 +209 @@
                 *cstart += rpath_sep + 1 - prefix;
                 free(prefix);
+                prefix = NULL;
 
                 cs->path_list = malloc(sizeof(char *) * 2);
@@ -252 +253 @@
         }
 
-        if (cs != NULL && cs->prefix != NULL)
+        if ((cs != NULL) && (cs->prefix != NULL))
                 free(cs->prefix);
+        
         if (dirname != NULL)
                 free(dirname);
+        
         if (prefix != NULL)
                 free(prefix);
+        
         if (stext != NULL)
                 free(stext);
+        
         if (cs != NULL)
                 free(cs);
+        
         if (tokens != NULL)
                 free(tokens);

uspace/app/bdsh/exec.c

@@ -97 +97 @@
 {
         task_id_t tid;
+        task_wait_t twait;
         task_exit_t texit;
         char *tmp;
@@ -121 +122 @@
         file_handles_p[i] = NULL;
 
-        rc = task_spawnvf(&tid, tmp, (const char **) argv, file_handles_p);
+        rc = task_spawnvf(&tid, &twait, tmp, (const char **) argv, file_handles_p);
         free(tmp);
 
@@ -130 +131 @@
         }
         
-        rc = task_wait(tid, &texit, &retval);
+        rc = task_wait(&twait, &texit, &retval);
         if (rc != EOK) {
                 printf("%s: Failed waiting for command (%s)\n", progname,