avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-15 18:21:07 +00:00
Code Issues Projects Releases Wiki Activity

* serial_open() calls will now return -1 on error (no call to exit())

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@948 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
Nils Springob
2010-10-22 14:29:56 +00:00
parent f1bf228061
commit 0c603e4791
13 changed files with 82 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ser_posix.c
View File

@@ -247,7 +247,7 @@ static int ser_set_dtr_rts(union filedescriptor *fdp, int is_on)
return 0;
}
static void ser_open(char * port, long baud, union filedescriptor *fdp)
static int ser_open(char * port, long baud, union filedescriptor *fdp)
{
int rc;
int fd;
@@ -258,7 +258,7 @@ static void ser_open(char * port, long baud, union filedescriptor *fdp)
*/
if (strncmp(port, "net:", strlen("net:")) == 0) {
net_open(port + strlen("net:"), fdp);
return;
return 0;
}
/*
@@ -268,7 +268,7 @@ static void ser_open(char * port, long baud, union filedescriptor *fdp)
if (fd < 0) {
fprintf(stderr, "%s: ser_open(): can't open device \"%s\": %s\n",
progname, port, strerror(errno));
exit(1);
return -1;
}
fdp->ifd = fd;
@@ -281,8 +281,10 @@ static void ser_open(char * port, long baud, union filedescriptor *fdp)
fprintf(stderr,
"%s: ser_open(): can't set attributes for device \"%s\": %s\n",
progname, port, strerror(-rc));
exit(1);
close(fd);
return -1;
}
return 0;
}