Chameleon Commit Details - 438 - Chameleon open source boot loader project.

Date:

2010-08-28 20:08:43 (13 years 7 months ago)

Author:

Tamás Kosárszky

Commit:

438

Parents:

437

Message:

Added string terminator in getVolumeLabelAlias(). Changed printing method in activity indicator drawing to prevent logging.

Changes:

M	/trunk/i386/boot2/graphics.c
M	/trunk/i386/libsaio/disk.c

File differences

-1767
1768 1768
1769 1769
1770
1770 1771
1771 1772
1772 1773
+        if ( matchVolumeToString(bvr, volStart, volLen) )␊
        {   ␊
            strncpy(str, aliasStart, min(strMaxLen, aliasLen));␊
            str[min(strMaxLen, aliasLen)] = '\0';␊
            free(aliasList);␊
        ␊
            return true;␊
         if ( matchVolumeToString(bvr, volStart, volLen) )␊
         {   ␊
             strncpy(str, aliasStart, min(strMaxLen, aliasLen));␊
+            str[min(strMaxLen, aliasLen)] = '\0';␊
             free(aliasList);␊
         ␊
             return true;␊

-1209
1210 1210
1211 1211
1212 
1212
1213
1213 1214
1214 1215
1215 1216
... ...
1218 1219
1219 1220
1220 1221
1221 
1222
1223
1222 1224
1223 1225
1224 1226
+␉␉{␊
␉␉␉currentIndicator = 0;␊
␉␉}␊
␉␉printf("%c\b", indicator[currentIndicator++]);␊
␉␉putc(indicator[currentIndicator++]);␊
␉␉putc('\b');␊
␉}␊
}␊
␊

{␊
    if ( getVideoMode() == VGA_TEXT_MODE )␊
    {␊
        printf(" \b");␊
␉␉putc(' ');␊
␉␉putc('\b');␊
    }␊
}␊
␊
 ...
 ␉␉{␊
 ␉␉␉currentIndicator = 0;␊
 ␉␉}␊
-␉␉printf("%c\b", indicator[currentIndicator++]);␊
+␉␉putc(indicator[currentIndicator++]);␊
+␉␉putc('\b');␊
 ␉}␊
 }␊
 ␊
 {␊
     if ( getVideoMode() == VGA_TEXT_MODE )␊
     {␊
-        printf(" \b");␊
+␉␉putc(' ');␊
+␉␉putc('\b');␊
     }␊
 }␊
 ␊