From 9e034bf6150fad216321a7f29a1d087e01973636 Mon Sep 17 00:00:00 2001 From: neil Date: Sat, 20 Jun 2015 18:15:37 +0000 Subject: [PATCH] Don't show unset volume creation dates (represented as 01-01-1978). git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@50848 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/c/Info.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/workbench/c/Info.c b/workbench/c/Info.c index 475a719d96..aa7d723f71 100644 --- a/workbench/c/Info.c +++ b/workbench/c/Info.c @@ -1,5 +1,5 @@ /* - Copyright © 1995-2012, The AROS Development Team. All rights reserved. + Copyright © 1995-2015, The AROS Development Team. All rights reserved. $Id$ Desc: Info Cli Command @@ -380,7 +380,7 @@ BOOL ScanDosList(STRPTR *filter) UBYTE type = ndl->dol_Type; UBYTE name[108]; - /* do not start non-started handlers or open CON: or RAW: windows.. */ + /* do not start non-started handlers or open CON: or RAW: windows */ if(type == DLT_DEVICE && !ndl->dol_Task) continue; @@ -389,14 +389,14 @@ BOOL ScanDosList(STRPTR *filter) if((type == DLT_DEVICE) && (myMatchPatternNoCase(strray, name) == FALSE)) { - int i; + D(int i); D(bug("Failure! -- name = %s, strray = %p\n", name, (void *)strray)); - for (i = 0; strray[i] != NULL; i++) + D(for (i = 0; strray[i] != NULL; i++) { - D(bug("Strray %i = %s\n", i, strray[i])); - } + bug("Strray %i = %s\n", i, strray[i]); + }) continue; } @@ -614,7 +614,6 @@ void doInfo() } /* check pattern strings */ - if(devs != NULL) { STRPTR *p = devs; @@ -828,6 +827,7 @@ void doInfo() VLPrintf(DISKSTITLE, "Volumes\n", NULL); + /* find the longest volume name */ for(MaxLen = 15, idn = head; idn; idn = idn->Next) { if(idn->IsVolume) @@ -851,6 +851,8 @@ void doInfo() // idn->Task ? GetStrFromCat(MOUNTEDSTR, "[Mounted]") : ""); TODO VLPrintf(VOLNAMEFMTSTR, nfmtstr, args); + if(idn->VolumeDate.ds_Days != 0) + { if(datetimeFmt) { UBYTE datestr[128]; @@ -892,6 +894,7 @@ void doInfo() VLPrintf(DATEFMTSTR, "created %.3s, %-10s %s", args); } } + } PutStr("\n"); } -- 2.11.4.GIT