Changeset c2245a3 in mainline for uspace/app

Timestamp:

2011-11-10T20:03:48Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

fa76f81

Parents:

27ca3a3 (diff), 747ef72 (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/mount/mount.c (modified) (3 diffs)
• locinfo/locinfo.c (modified) (1 diff)

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

@@ -27 +27 @@
  */
 
+#include <loc.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -67 +68 @@
 {
         LIST_INITIALIZE(mtab_list);
+        mtab_ent_t *old_ent = NULL;
+        char *svc_name;
+        int rc;
+
         get_mtab_list(&mtab_list);
-
-        mtab_ent_t *old_ent = NULL;
 
         list_foreach(mtab_list, cur) {
@@ -83 +86 @@
                 if (mtab_ent->instance)
                         printf("/%d", mtab_ent->instance);
-                printf(" on %s ", mtab_ent->mp);
+
+                printf(" %s", mtab_ent->mp);
+
+                rc = loc_service_get_name(mtab_ent->service_id, &svc_name);
+                if (rc == EOK) {
+                        printf(" %s", svc_name);
+                        free(svc_name);
+                } else {
+                        printf(" (%" PRIun ")", mtab_ent->service_id);
+                }
 
                 if (str_size(mtab_ent->opts) > 0)
-                        printf("opts=%s ", mtab_ent->opts);
+                        printf(" (%s)", mtab_ent->opts);
 
-                printf("(service=%" PRIun ")\n", mtab_ent->service_id);
+                putchar('\n');
         }
 

uspace/app/locinfo/locinfo.c

@@ -89 +89 @@
                         }
                         printf("\t%s (%" PRIun ")\n", svc_name, svc_ids[j]);
+                        free(svc_name);
                 }