comparison libpurple/plugins/log_reader.c @ 20344:b81af0bef062

applied changes from 8152fe0104bfcc5da3dda8b81badd6f63f9532b8 through e9e74094baa29c6f5589385507221a2502b817fb
author Luke Schierer <lschiere@pidgin.im>
date Sun, 21 Oct 2007 04:42:20 +0000
parents d4cdca890d8e
children 44842d3f49ce
comparison
equal deleted inserted replaced
20343:76f85fb7759f 20344:b81af0bef062
112 if (!handle) { 112 if (!handle) {
113 g_free(filename); 113 g_free(filename);
114 continue; 114 continue;
115 } 115 }
116 116
117 rd = fread(contents, 56, 1, handle) == 0; 117 rd = fread(contents, 1, 56, handle) == 0;
118 fclose(handle); 118 fclose(handle);
119 contents[rd] = '\0'; 119 contents[rd] = '\0';
120 120
121 /* XXX: This is fairly inflexible. */ 121 /* XXX: This is fairly inflexible. */
122 contents2 = contents; 122 contents2 = contents;
174 if (!handle) { 174 if (!handle) {
175 g_free(filename); 175 g_free(filename);
176 continue; 176 continue;
177 } 177 }
178 178
179 rd = fread(contents, 13, 1, handle); 179 rd = fread(contents, 1, 13, handle);
180 fclose(handle); 180 fclose(handle);
181 contents[rd] = '\0'; 181 contents[rd] = '\0';
182 182
183 contents2 = contents; 183 contents2 = contents;
184 while (*contents2 && *contents2 != '(') 184 while (*contents2 && *contents2 != '(')
1437 1437
1438 read = g_malloc(data->length + 2); 1438 read = g_malloc(data->length + 2);
1439 1439
1440 file = g_fopen(data->path, "rb"); 1440 file = g_fopen(data->path, "rb");
1441 fseek(file, data->offset, SEEK_SET); 1441 fseek(file, data->offset, SEEK_SET);
1442 data->length = fread(read, data->length, 1, file); 1442 data->length = fread(read, 1, data->length, file);
1443 fclose(file); 1443 fclose(file);
1444 1444
1445 if (read[data->length-1] == '\n') { 1445 if (read[data->length-1] == '\n') {
1446 read[data->length] = '\0'; 1446 read[data->length] = '\0';
1447 } else { 1447 } else {
1936 g_return_val_if_fail(file != NULL, g_strdup("")); 1936 g_return_val_if_fail(file != NULL, g_strdup(""));
1937 1937
1938 contents = g_malloc(data->length + 2); 1938 contents = g_malloc(data->length + 2);
1939 1939
1940 fseek(file, data->offset, SEEK_SET); 1940 fseek(file, data->offset, SEEK_SET);
1941 data->length = fread(contents, data->length, 1, file); 1941 data->length = fread(contents, 1, data->length, file);
1942 fclose(file); 1942 fclose(file);
1943 1943
1944 contents[data->length] = '\n'; 1944 contents[data->length] = '\n';
1945 contents[data->length + 1] = '\0'; 1945 contents[data->length + 1] = '\0';
1946 1946
2329 2329
2330 file = g_fopen(data->path, "rb"); 2330 file = g_fopen(data->path, "rb");
2331 g_return_val_if_fail(file != NULL, g_strdup("")); 2331 g_return_val_if_fail(file != NULL, g_strdup(""));
2332 2332
2333 fseek(file, data->offset, SEEK_SET); 2333 fseek(file, data->offset, SEEK_SET);
2334 data->length = fread(contents, data->length, 1, file); 2334 data->length = fread(contents, 1, data->length, file);
2335 fclose(file); 2335 fclose(file);
2336 2336
2337 contents[data->length] = '\n'; 2337 contents[data->length] = '\n';
2338 contents[data->length + 1] = '\0'; 2338 contents[data->length + 1] = '\0';
2339 2339