Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-10 13:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

- cmd_label: If a label is given on the command line, don't truncate it to only 12 characters; NTFS supports up to 32. Also, use _tcsncat, since _tcsncpy won't always nul-terminate.

Browse source 
- Don't show the old volume information if a label was given on the command line. (Bug 3621)
- If setting the label was unsuccessful, give an error message.

svn path=/trunk/; revision=35098
This commit is contained in:
Jeffrey Morlan 2008-08-04 14:16:01 +00:00
parent 65c33891f6
commit 489d4d8089
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reactos/base/shell/cmd/label.c
View file

@ -57,7 +57,7 @@ INT cmd_label (LPTSTR cmd, LPTSTR param)
szRootPath[0] = szCurPath[0];
}
_tcsncpy (szLabel, param, 12);
_tcsncat(szLabel, param, 79);
/* check root path */
if (!IsValidPathName (szRootPath))
@ -67,30 +67,35 @@ INT cmd_label (LPTSTR cmd, LPTSTR param)
return 1;
}
GetVolumeInformation(szRootPath, szOldLabel, 80, &dwSerialNr,
NULL, NULL, NULL, 0);
/* print drive info */
if (szOldLabel[0] != _T('\0'))
{
ConOutResPrintf(STRING_LABEL_HELP2, _totupper(szRootPath[0]), szOldLabel);
}
else
{
ConOutResPrintf(STRING_LABEL_HELP3, _totupper(szRootPath[0]));
}
/* print the volume serial number */
ConOutResPrintf(STRING_LABEL_HELP4, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
if (szLabel[0] == _T('\0'))
{
GetVolumeInformation(szRootPath, szOldLabel, 80, &dwSerialNr,
NULL, NULL, NULL, 0);
/* print drive info */
if (szOldLabel[0] != _T('\0'))
{
ConOutResPrintf(STRING_LABEL_HELP2, _totupper(szRootPath[0]), szOldLabel);
}
else
{
ConOutResPrintf(STRING_LABEL_HELP3, _totupper(szRootPath[0]));
}
/* print the volume serial number */
ConOutResPrintf(STRING_LABEL_HELP4, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
ConOutResPuts(STRING_LABEL_HELP5);
ConInString(szLabel, 80);
}
SetVolumeLabel(szRootPath, szLabel);
if (!SetVolumeLabel(szRootPath, szLabel))
{
ConOutFormatMessage(GetLastError());
nErrorLevel = 1;
return 1;
}
return 0;
}