Obsolete
/
libipc-old
Archived
3
0
Fork 0
Code

la merde

more_to_read
lapupe 2016-09-10 17:50:02 +02:00
parent bfb14a3641
commit 878c5e7acc
2 changed files with 4 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
lib/communication.c
View File

@ -17,80 +17,7 @@ int file_write (const char *path, const char *buf, size_t msize)
return ret;
}
/*int file_read (const char *path, char **buf, size_t *msize)
{
<<<<<<< HEAD
if (f != 0) {
if (fclose (f)) {
return ER_FILE_CLOSE;
}
printf ("FILE_CLOSE: closed file\n");
=======
int fd = open (path, O_RDONLY);
if (fd <= 0) {
return ER_FILE_OPEN;
>>>>>>> 99ca565bb6bf3729df3a1ec6ceeb2a58211751f5
}
<<<<<<< HEAD
int file_read (FILE *f, char **buf, size_t *msize) {
size_t n =0;
if (*msize == 0) {
*msize = BUFSIZ; // default value
}
if (*buf == NULL) {
*buf = malloc (*msize);
if (*buf == NULL) {
fprintf (stderr, "FILE_READ: err can't allocate enough memory (%ld)\n", *msize);
int ret = file_close (f);
if (ret != 0)
return ret;
}
}
//*msize = fread (*buf, *msize, 1, f);
// if (*msize == 0) {
// fprintf (stderr, "FILE_READ: err can't read a file\n");
// if (ER_FILE_CLOSE == file_close (f)) {
// fprintf (stderr, "FILE_READ: err closing the file\n");
// return ER_FILE_CLOSE;
// }
// return ER_FILE_READ;
// }
*msize = getline (buf, &n, f);
if (*msize == 0) {
fprintf (stderr, "FILE_READ: err can't read a file\n");
if (ER_FILE_CLOSE == file_close (f)) {
fprintf (stderr, "FILE_READ: err closing the file\n");
return ER_FILE_CLOSE;
}
return ER_FILE_READ;
=======
if (*buf == NULL)
*buf = malloc (BUFSIZ);
int ret = 0;
int ret2 = 0;
ret = read (fd, *buf, BUFSIZ);
if (ret <= 0) {
fprintf (stderr, "err: read %s\n", path);
}
else {
*msize = ret;
>>>>>>> 99ca565bb6bf3729df3a1ec6ceeb2a58211751f5
}
ret2 = close (fd);
if (ret2 < 0) {
fprintf (stderr, "err: close [err: %d] %s\n", ret2, path);
perror ("closing");
}
return ret;
}*/
int file_read (const char *path, char **buf, size_t *msize)
{
@ -114,6 +41,7 @@ int file_read (const char *path, char **buf, size_t *msize)
fprintf (stderr, "err: close [err: %d] %s\n", ret2, path);
perror ("closing");
}
return ret;
}

6
lib/process.c
View File

@ -32,16 +32,14 @@ void srv_process_gen (struct process *p
//printf("path-in : %s\n", p->path_in );
//printf("path-out : %s\n", p->path_out );
p->in = NULL;
p->out = NULL;
}
void srv_process_free (struct process * p)
{
// TODO nothing to do now
snprintf(p->path_in , PATH_MAX, "%s/%d-%d-in" , TMPDIR, pid, index);
snprintf(p->path_out, PATH_MAX, "%s/%d-%d-out", TMPDIR, pid, index);
// snprintf(p->path_in , PATH_MAX, "%s/%d-%d-in" , TMPDIR, pid, index);
// snprintf(p->path_out, PATH_MAX, "%s/%d-%d-out", TMPDIR, pid, index);
}