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

Date:

2015-03-12 04:36:50 (9 years 1 month ago)

Author:

ErmaC

Commit:

2620

Parents:

2619

Message:

strlcat instead of strcat.

Changes:

M	/trunk/i386/modules/Keylayout/Keylayout.c
M	/trunk/i386/libsaio/disk.c

File differences

-1837
1838 1838
1839 1839
1840 
1840
1841
1842
1841 1843
1842 1844
1843 1845
+␉␉␉ret = GetFileInfo(dirSpec, fileSpec, &flags, &time);␊
␉␉␉if (!ret)␊
␉␉␉{␊
␉␉␉␉fh = open(strcat(dirSpec, fileSpec), 0);␊
␉␉␉␉strlcat(dirSpec, fileSpec, sizeof(dirSpec));␊
␉␉␉␉fh = open(dirSpec,0);␊
␊
␉␉␉␉fileSize = file_size(fh);␊
␉␉␉␉if (fileSize > 0 && fileSize < BVSTRLEN)␊
␉␉␉␉{␊
 ␉␉␉ret = GetFileInfo(dirSpec, fileSpec, &flags, &time);␊
 ␉␉␉if (!ret)␊
 ␉␉␉{␊
-␉␉␉␉fh = open(strcat(dirSpec, fileSpec), 0);␊
+␉␉␉␉strlcat(dirSpec, fileSpec, sizeof(dirSpec));␊
+␉␉␉␉fh = open(dirSpec,0);␊
+␊
 ␉␉␉␉fileSize = file_size(fh);␊
 ␉␉␉␉if (fileSize > 0 && fileSize < BVSTRLEN)␊
 ␉␉␉␉{␊

-141
142 142
143 143
144 
144
145 145
146 146
147 147
+␉␉snprintf(layoutPath, sizeof(layoutPath),"/Extra/Keymaps/%s", val);␊
␉␉// Add the extension if needed␊
␉␉if (len <= 4 || strncmp(val+len-4,".lyt", sizeof(".lyt")) != 0)␊
␉␉␉strncat(layoutPath, ".lyt", sizeof(layoutPath) - strlen(layoutPath) - 1);␊
␉␉␉strlcat(layoutPath, ".lyt", sizeof(layoutPath));␊
␊
␉␉if (!load_keyboard_layout_file(layoutPath))␊
␉␉{␊
 ␉␉snprintf(layoutPath, sizeof(layoutPath),"/Extra/Keymaps/%s", val);␊
 ␉␉// Add the extension if needed␊
 ␉␉if (len <= 4 || strncmp(val+len-4,".lyt", sizeof(".lyt")) != 0)␊
-␉␉␉strncat(layoutPath, ".lyt", sizeof(layoutPath) - strlen(layoutPath) - 1);␊
+␉␉␉strlcat(layoutPath, ".lyt", sizeof(layoutPath));␊
 ␊
 ␉␉if (!load_keyboard_layout_file(layoutPath))␊
 ␉␉{␊