git.stevedylan.dev

fixing sizeof stuff 8c20e5db

arg@mig29 · 2006-11-26 15:49 2 file(s) · +7 −7

draw.c +2 −2

		return;
	w = 0;
	olen = len = strlen(text);
	if(len >= sizeof(buf))
		len = sizeof(buf) - 1;
	if(len >= sizeof buf)
		len = sizeof buf - 1;
	memcpy(buf, text, len);
	buf[len] = 0;
	h = dc.font.ascent + dc.font.descent;

main.c +5 −5


	len = strlen(text);
	buf[0] = 0;
	num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
	if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
			|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
			|| IsPrivateKeypadKey(ksym))

	case XK_Tab:
		if(!sel)
			return;
		strncpy(text, sel->text, sizeof(text));
		strncpy(text, sel->text, sizeof text);
		match(text);
		break;
	case XK_Right:

		if(num && !iscntrl((int) buf[0])) {
			buf[num] = 0;
			if(len > 0)
				strncat(text, buf, sizeof(text));
				strncat(text, buf, sizeof text);
			else
				strncpy(text, buf, sizeof(text));
				strncpy(text, buf, sizeof text);
			match(text);
		}
	}

	Item *i, *new;

	i = 0;
	while(fgets(buf, sizeof(buf), stdin)) {
	while(fgets(buf, sizeof buf, stdin)) {
		len = strlen(buf);
		if (buf[len - 1] == '\n')
			buf[len - 1] = 0;

35	35		return;
36	36		w = 0;
37	37		olen = len = strlen(text);
38		-	if(len >= sizeof(buf))
39		-	len = sizeof(buf) - 1;
	38	+	if(len >= sizeof buf)
	39	+	len = sizeof buf - 1;
40	40		memcpy(buf, text, len);
41	41		buf[len] = 0;
42	42		h = dc.font.ascent + dc.font.descent;

144	144
145	145		len = strlen(text);
146	146		buf[0] = 0;
147		-	num = XLookupString(e, buf, sizeof(buf), &ksym, 0);
	147	+	num = XLookupString(e, buf, sizeof buf, &ksym, 0);
148	148		if(IsFunctionKey(ksym) \|\| IsKeypadKey(ksym)
149	149		\|\| IsMiscFunctionKey(ksym) \|\| IsPFKey(ksym)
150	150		\|\| IsPrivateKeypadKey(ksym))

181	181		case XK_Tab:
182	182		if(!sel)
183	183		return;
184		-	strncpy(text, sel->text, sizeof(text));
	184	+	strncpy(text, sel->text, sizeof text);
185	185		match(text);
186	186		break;
187	187		case XK_Right:

221	221		if(num && !iscntrl((int) buf[0])) {
222	222		buf[num] = 0;
223	223		if(len > 0)
224		-	strncat(text, buf, sizeof(text));
	224	+	strncat(text, buf, sizeof text);
225	225		else
226		-	strncpy(text, buf, sizeof(text));
	226	+	strncpy(text, buf, sizeof text);
227	227		match(text);
228	228		}
229	229		}

238	238		Item i, new;
239	239
240	240		i = 0;
241		-	while(fgets(buf, sizeof(buf), stdin)) {
	241	+	while(fgets(buf, sizeof buf, stdin)) {
242	242		len = strlen(buf);
243	243		if (buf[len - 1] == '\n')
244	244		buf[len - 1] = 0;