Index: /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py
===================================================================
--- /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py	(revision 29799)
+++ /trunk/src/VBox/Frontends/VBoxShell/vboxshell.py	(revision 29800)
@@ -843,5 +843,5 @@
         print "exec in guest needs at least program name"
         return
-    user = ""
+    user = "nike"
     passwd = ""
     tmo = 0
@@ -1702,5 +1702,5 @@
        if dvd.state != ctx['global'].constants.MediumState_Created:
            dvd.refreshState()
-       print "   %s (%s)%s %s" %(colPath(ctx,dvd.location), dvd.format,optId(verbose,hdd.id),colSizeM(ctx,asSize(hdd.size, True)))
+       print "   %s (%s)%s %s" %(colPath(ctx,dvd.location), dvd.format,optId(verbose,dvd.id),colSizeM(ctx,asSize(dvd.size, True)))
 
    floppys = ctx['global'].getArray(ctx['vb'], 'floppyImages')
@@ -1709,5 +1709,5 @@
        if floppy.state != ctx['global'].constants.MediumState_Created:
            floppy.refreshState()
-       print "   %s (%s)%s %s" %(colPath(ctx,floppy.location), floppy.format,optId(verbose,hdd.id), colSizeM(ctx,asSize(hdd.size, True)))
+       print "   %s (%s)%s %s" %(colPath(ctx,floppy.location), floppy.format,optId(verbose,floppy.id), colSizeM(ctx,asSize(floppy.size, True)))
 
    return 0
@@ -2407,5 +2407,5 @@
     }
 
-    if args[1] == 'help':
+    if len(args) < 2 or args[1] == 'help':
         if len(args) > 2:
             print natcommands[args[2]].__doc__
@@ -2470,5 +2470,5 @@
     (rc, r) = nicSwitchOnOff(adapter, 'traceEnabled', args)
     if len(args) == 1 and rc == 0:
-        r = '%s file:%s' % (r, adapter.traceFile) 
+        r = '%s file:%s' % (r, adapter.traceFile)
         return (0, r)
     elif len(args) == 3 and rc == 0:
@@ -2529,5 +2529,5 @@
             ctx['global'].constants.NetworkAttachmentType_HostOnly: ('HostOnly', adapter.hostInterface),
             #ctx['global'].constants.NetworkAttachmentType_VDE: ('VDE', adapter.VDENetwork)
-        } 
+        }
         import types
         if type(adapter.attachmentType) != types.IntType:
@@ -2540,9 +2540,9 @@
         nicAttachmentType = {
             'Null': {
-                'v': lambda: len(args) == 2, 
+                'v': lambda: len(args) == 2,
                 'p': lambda: 'do nothing',
                 'f': lambda: adapter.detach()},
             'NAT': {
-                'v': lambda: len(args) == 2, 
+                'v': lambda: len(args) == 2,
                 'p': lambda: 'do nothing',
                 'f': lambda: adapter.attachToNAT()},
@@ -2559,14 +2559,14 @@
                 'p': lambda: adapter.__setattr__('hostInterface', args[2]),
                 'f': lambda: adapter.attachToHostOnlyInterface()},
-            'VDE': { 
+            'VDE': {
                 'v': lambda: len(args) == 3,
                 'p': lambda: adapter.__setattr__('VDENetwork', args[2]),
                 'f': lambda: adapter.attachToVDE()}
-        } 
+        }
         if args[1] not in nicAttachmentType.keys():
             print '{0} not in acceptable values ({1})'.format(args[1], nicAttachmentType.keys())
             return (1, None)
         if not nicAttachmentType[args[1]]['v']():
-            print nicAttachmentType.__doc__ 
+            print nicAttachmentType.__doc__
             return (1, None)
         nicAttachmentType[args[1]]['p']()
@@ -2576,5 +2576,5 @@
 def nicCmd(ctx, args):
     '''
-    This command to manage network adapters 
+    This command to manage network adapters
     usage: nic <vm> <nicnum> <cmd> <cmd-args>
     where cmd : attachment, trace, linespeed, cable, enable, type
@@ -2589,10 +2589,10 @@
         'type': nicTypeSubCmd
     }
-    if     args[1] == 'help' \
-        or len(args) < 2 \
+    if  len(args) < 2 \
+        or args[1] == 'help' \
         or (len(args) > 2 and args[3] not in niccomand):
         if len(args) == 3 \
            and args[2] in niccomand:
-            print niccomand[args[2]].__doc__ 
+            print niccomand[args[2]].__doc__
         else:
             print nicCmd.__doc__
@@ -2603,5 +2603,5 @@
         print 'please specify vm'
         return 0
-     
+
     if    len(args) < 3 \
        or not args[2].isdigit() \
@@ -2611,7 +2611,7 @@
     nicnum = int(args[2])
     cmdargs = args[3:]
-    func = args[3] 
+    func = args[3]
     session = None
-    session = ctx['global'].openMachineSession(vm.id) 
+    session = ctx['global'].openMachineSession(vm.id)
     vm = session.machine
     adapter = vm.getNetworkAdapter(nicnum)