comparison src/toc.c @ 79:bfdc427b936d

[gaim-migrate @ 89] I'll save time and just post the email :-) Summary of changes: * Misc malloc/free cleanups, use g_malloc more places and other small stuff (e.g. lineardata not being freed in the error case in sound.c) * Misc signed/unsigned cleanups (use size_t more often) * read() can return -1 at any point, check return values more rigorously (read_rv variables used for this) * In can_play_audio, stat requires a pointer to an allocated stat_buf (the address of an automatic variable) * escape_text needs a buffer at least 4 times the size of the text being passed in (not 2 times); I can force core dumps with lots of newlines otherwise * There's a debug statement in netscape_command (browser.c) that was printf("Hello%d\n"); with no int for the %d; I threw in a getppid(), but the statement should probably come out eventually. Thanks, G Sumner Hayes! committer: Tailor Script <[e-mail]>

78:66c5a24b62ec

	return write(toc_fd, obuf, slen);
}


int wait_reply(char *buffer, int buflen)
{
        int res=6;
	struct sflap_hdr *hdr=(struct sflap_hdr *)buffer;
        char *c;

        while((res = read(toc_fd, buffer, 1))) {
		if (res < 0)
			return res;
		if (buffer[0] == '*')
                        break;

	}

	res = read(toc_fd, buffer+1, sizeof(struct sflap_hdr) - 1);

        if (res < 0)
		return res;

	res += 1;
	
        
	sprintf(debug_buff, "Rcv: %s %s\n",print_header(buffer), "");
	debug_print(debug_buff);



        while (res < (sizeof(struct sflap_hdr) + ntohs(hdr->len))) {
		res += read(toc_fd, buffer + res, (ntohs(hdr->len) + sizeof(struct sflap_hdr)) - res);
		while(gtk_events_pending())
			gtk_main_iteration();
	}
        
        if (res >= sizeof(struct sflap_hdr)) 

79:bfdc427b936d

	return write(toc_fd, obuf, slen);
}


int wait_reply(char *buffer, size_t buflen)
{
        size_t res=-1;
	int read_rv = -1;
	struct sflap_hdr *hdr=(struct sflap_hdr *)buffer;
        char *c;

	if(buflen < sizeof(struct sflap_hdr)) {
	    do_error_dialog("Buffer too small", "Gaim - Error (internal)");
	    return -1;
	}

        while((read_rv = read(toc_fd, buffer, 1))) {
		if (read_rv < 0 || read_rv > 1)
			return -1;
		if (buffer[0] == '*')
                        break;

	}

	read_rv = read(toc_fd, buffer+1, sizeof(struct sflap_hdr) - 1);

        if (read_rv < 0)
		return read_rv;

	res = read_rv + 1;
	
        
	sprintf(debug_buff, "Rcv: %s %s\n",print_header(buffer), "");
	debug_print(debug_buff);


	if(buflen < sizeof(struct sflap_hdr) + ntohs(hdr->len) + 1) {
	    do_error_dialog("Buffer too small", "Gaim - Error (internal)");
	    return -1;
	}

        while (res < (sizeof(struct sflap_hdr) + ntohs(hdr->len))) {
		read_rv = read(toc_fd, buffer + res, (ntohs(hdr->len) + sizeof(struct sflap_hdr)) - res);
		if(read_rv < 0) return read_rv;
		res += read_rv;
		while(gtk_events_pending())
			gtk_main_iteration();
	}
        
        if (res >= sizeof(struct sflap_hdr))