RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2002-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* lib/tftpDriver.c: Remove set_errno_and_return_minus_one, include
	<rtems/seterr.h>.
This commit is contained in:
Joel Sherrill
2002-01-04 18:25:27 +00:00
parent 3cb43d3e2b
commit d4651e4104
6 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/exec/libnetworking/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* lib/tftpDriver.c: Remove set_errno_and_return_minus_one, include
<rtems/seterr.h>.
2001-12-18 Eric Norum <eric.norum@usask.ca> 2001-12-18 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.c: Allow chdir() to work on TFTP `directories' * lib/tftpDriver.c: Allow chdir() to work on TFTP `directories'

28
c/src/exec/libnetworking/lib/tftpDriver.c
View File

@@ -25,17 +25,13 @@
#include <rtems.h> #include <rtems.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libio_.h> #include <rtems/libio_.h>
#include <rtems/seterr.h>
#include <rtems/rtems_bsdnet.h> #include <rtems/rtems_bsdnet.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifndef set_errno_and_return_minus_one
#define set_errno_and_return_minus_one( _error ) \
do { errno = (_error); return -1; } while(0)
#endif
#ifdef RTEMS_TFTP_DRIVER_DEBUG #ifdef RTEMS_TFTP_DRIVER_DEBUG
int rtems_tftp_driver_debug = 1; int rtems_tftp_driver_debug = 1;
#endif #endif
@@ -228,7 +224,7 @@ static int rtems_tftp_mount_me(
); );
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
return 0; return 0;
} }
@@ -431,7 +427,7 @@ static int rtems_tftp_evaluate_for_make(
) )
{ {
pathloc->node_access = NULL; pathloc->node_access = NULL;
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
} }
/* /*
@@ -508,18 +504,18 @@ static int rtems_tftp_eval_path(
* Reject attempts to open() directories * Reject attempts to open() directories
*/ */
if (flags & RTEMS_LIBIO_PERMS_RDWR) if (flags & RTEMS_LIBIO_PERMS_RDWR)
set_errno_and_return_minus_one( EISDIR ); rtems_set_errno_and_return_minus_one( EISDIR );
if (isRelative) { if (isRelative) {
cp = malloc (strlen(pathloc->node_access)+strlen(pathname)+1); cp = malloc (strlen(pathloc->node_access)+strlen(pathname)+1);
if (cp == NULL) if (cp == NULL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
strcpy (cp, pathloc->node_access); strcpy (cp, pathloc->node_access);
strcat (cp, pathname); strcat (cp, pathname);
} }
else { else {
cp = strdup (pathname); cp = strdup (pathname);
if (cp == NULL) if (cp == NULL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
} }
fixPath (cp); fixPath (cp);
pathloc->node_access = cp; pathloc->node_access = cp;
@@ -533,7 +529,7 @@ static int rtems_tftp_eval_path(
*/ */
flags &= RTEMS_LIBIO_PERMS_READ | RTEMS_LIBIO_PERMS_WRITE; flags &= RTEMS_LIBIO_PERMS_READ | RTEMS_LIBIO_PERMS_WRITE;
if ((flags != RTEMS_LIBIO_PERMS_READ) && (flags != RTEMS_LIBIO_PERMS_WRITE) ) if ((flags != RTEMS_LIBIO_PERMS_READ) && (flags != RTEMS_LIBIO_PERMS_WRITE) )
set_errno_and_return_minus_one( EINVAL ); rtems_set_errno_and_return_minus_one( EINVAL );
return 0; return 0;
} }
@@ -847,20 +843,20 @@ static int rtems_tftp_read(
tp->eof = (tp->nleft < TFTP_BUFSIZE); tp->eof = (tp->nleft < TFTP_BUFSIZE);
tp->blocknum++; tp->blocknum++;
if (sendAck (tp) != 0) if (sendAck (tp) != 0)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
break; break;
} }
if (opcode == TFTP_OPCODE_ERROR) if (opcode == TFTP_OPCODE_ERROR)
set_errno_and_return_minus_one( tftpErrno (tp) ); rtems_set_errno_and_return_minus_one( tftpErrno (tp) );
} }
/* /*
* Keep trying? * Keep trying?
*/ */
if (++retryCount == IO_RETRY_LIMIT) if (++retryCount == IO_RETRY_LIMIT)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
if (sendAck (tp) != 0) if (sendAck (tp) != 0)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
} }
} }
return count - nwant; return count - nwant;
@@ -977,7 +973,7 @@ static int rtems_tftp_write(
int e = rtems_tftp_flush (tp); int e = rtems_tftp_flush (tp);
if (e) { if (e) {
tp->writing = 0; tp->writing = 0;
set_errno_and_return_minus_one (e); rtems_set_errno_and_return_minus_one (e);
} }
} }
} }

6
c/src/libnetworking/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* lib/tftpDriver.c: Remove set_errno_and_return_minus_one, include
<rtems/seterr.h>.
2001-12-18 Eric Norum <eric.norum@usask.ca> 2001-12-18 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.c: Allow chdir() to work on TFTP `directories' * lib/tftpDriver.c: Allow chdir() to work on TFTP `directories'

28
c/src/libnetworking/lib/tftpDriver.c
View File

@@ -25,17 +25,13 @@
#include <rtems.h> #include <rtems.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libio_.h> #include <rtems/libio_.h>
#include <rtems/seterr.h>
#include <rtems/rtems_bsdnet.h> #include <rtems/rtems_bsdnet.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifndef set_errno_and_return_minus_one
#define set_errno_and_return_minus_one( _error ) \
do { errno = (_error); return -1; } while(0)
#endif
#ifdef RTEMS_TFTP_DRIVER_DEBUG #ifdef RTEMS_TFTP_DRIVER_DEBUG
int rtems_tftp_driver_debug = 1; int rtems_tftp_driver_debug = 1;
#endif #endif
@@ -228,7 +224,7 @@ static int rtems_tftp_mount_me(
); );
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
return 0; return 0;
} }
@@ -431,7 +427,7 @@ static int rtems_tftp_evaluate_for_make(
) )
{ {
pathloc->node_access = NULL; pathloc->node_access = NULL;
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
} }
/* /*
@@ -508,18 +504,18 @@ static int rtems_tftp_eval_path(
* Reject attempts to open() directories * Reject attempts to open() directories
*/ */
if (flags & RTEMS_LIBIO_PERMS_RDWR) if (flags & RTEMS_LIBIO_PERMS_RDWR)
set_errno_and_return_minus_one( EISDIR ); rtems_set_errno_and_return_minus_one( EISDIR );
if (isRelative) { if (isRelative) {
cp = malloc (strlen(pathloc->node_access)+strlen(pathname)+1); cp = malloc (strlen(pathloc->node_access)+strlen(pathname)+1);
if (cp == NULL) if (cp == NULL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
strcpy (cp, pathloc->node_access); strcpy (cp, pathloc->node_access);
strcat (cp, pathname); strcat (cp, pathname);
} }
else { else {
cp = strdup (pathname); cp = strdup (pathname);
if (cp == NULL) if (cp == NULL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
} }
fixPath (cp); fixPath (cp);
pathloc->node_access = cp; pathloc->node_access = cp;
@@ -533,7 +529,7 @@ static int rtems_tftp_eval_path(
*/ */
flags &= RTEMS_LIBIO_PERMS_READ | RTEMS_LIBIO_PERMS_WRITE; flags &= RTEMS_LIBIO_PERMS_READ | RTEMS_LIBIO_PERMS_WRITE;
if ((flags != RTEMS_LIBIO_PERMS_READ) && (flags != RTEMS_LIBIO_PERMS_WRITE) ) if ((flags != RTEMS_LIBIO_PERMS_READ) && (flags != RTEMS_LIBIO_PERMS_WRITE) )
set_errno_and_return_minus_one( EINVAL ); rtems_set_errno_and_return_minus_one( EINVAL );
return 0; return 0;
} }
@@ -847,20 +843,20 @@ static int rtems_tftp_read(
tp->eof = (tp->nleft < TFTP_BUFSIZE); tp->eof = (tp->nleft < TFTP_BUFSIZE);
tp->blocknum++; tp->blocknum++;
if (sendAck (tp) != 0) if (sendAck (tp) != 0)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
break; break;
} }
if (opcode == TFTP_OPCODE_ERROR) if (opcode == TFTP_OPCODE_ERROR)
set_errno_and_return_minus_one( tftpErrno (tp) ); rtems_set_errno_and_return_minus_one( tftpErrno (tp) );
} }
/* /*
* Keep trying? * Keep trying?
*/ */
if (++retryCount == IO_RETRY_LIMIT) if (++retryCount == IO_RETRY_LIMIT)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
if (sendAck (tp) != 0) if (sendAck (tp) != 0)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
} }
} }
return count - nwant; return count - nwant;
@@ -977,7 +973,7 @@ static int rtems_tftp_write(
int e = rtems_tftp_flush (tp); int e = rtems_tftp_flush (tp);
if (e) { if (e) {
tp->writing = 0; tp->writing = 0;
set_errno_and_return_minus_one (e); rtems_set_errno_and_return_minus_one (e);
} }
} }
} }

6
cpukit/libnetworking/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* lib/tftpDriver.c: Remove set_errno_and_return_minus_one, include
<rtems/seterr.h>.
2001-12-18 Eric Norum <eric.norum@usask.ca> 2001-12-18 Eric Norum <eric.norum@usask.ca>
* lib/tftpDriver.c: Allow chdir() to work on TFTP `directories' * lib/tftpDriver.c: Allow chdir() to work on TFTP `directories'

28
cpukit/libnetworking/lib/tftpDriver.c
View File

@@ -25,17 +25,13 @@
#include <rtems.h> #include <rtems.h>
#include <rtems/libio.h> #include <rtems/libio.h>
#include <rtems/libio_.h> #include <rtems/libio_.h>
#include <rtems/seterr.h>
#include <rtems/rtems_bsdnet.h> #include <rtems/rtems_bsdnet.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#ifndef set_errno_and_return_minus_one
#define set_errno_and_return_minus_one( _error ) \
do { errno = (_error); return -1; } while(0)
#endif
#ifdef RTEMS_TFTP_DRIVER_DEBUG #ifdef RTEMS_TFTP_DRIVER_DEBUG
int rtems_tftp_driver_debug = 1; int rtems_tftp_driver_debug = 1;
#endif #endif
@@ -228,7 +224,7 @@ static int rtems_tftp_mount_me(
); );
if (sc != RTEMS_SUCCESSFUL) if (sc != RTEMS_SUCCESSFUL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
return 0; return 0;
} }
@@ -431,7 +427,7 @@ static int rtems_tftp_evaluate_for_make(
) )
{ {
pathloc->node_access = NULL; pathloc->node_access = NULL;
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
} }
/* /*
@@ -508,18 +504,18 @@ static int rtems_tftp_eval_path(
* Reject attempts to open() directories * Reject attempts to open() directories
*/ */
if (flags & RTEMS_LIBIO_PERMS_RDWR) if (flags & RTEMS_LIBIO_PERMS_RDWR)
set_errno_and_return_minus_one( EISDIR ); rtems_set_errno_and_return_minus_one( EISDIR );
if (isRelative) { if (isRelative) {
cp = malloc (strlen(pathloc->node_access)+strlen(pathname)+1); cp = malloc (strlen(pathloc->node_access)+strlen(pathname)+1);
if (cp == NULL) if (cp == NULL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
strcpy (cp, pathloc->node_access); strcpy (cp, pathloc->node_access);
strcat (cp, pathname); strcat (cp, pathname);
} }
else { else {
cp = strdup (pathname); cp = strdup (pathname);
if (cp == NULL) if (cp == NULL)
set_errno_and_return_minus_one( ENOMEM ); rtems_set_errno_and_return_minus_one( ENOMEM );
} }
fixPath (cp); fixPath (cp);
pathloc->node_access = cp; pathloc->node_access = cp;
@@ -533,7 +529,7 @@ static int rtems_tftp_eval_path(
*/ */
flags &= RTEMS_LIBIO_PERMS_READ | RTEMS_LIBIO_PERMS_WRITE; flags &= RTEMS_LIBIO_PERMS_READ | RTEMS_LIBIO_PERMS_WRITE;
if ((flags != RTEMS_LIBIO_PERMS_READ) && (flags != RTEMS_LIBIO_PERMS_WRITE) ) if ((flags != RTEMS_LIBIO_PERMS_READ) && (flags != RTEMS_LIBIO_PERMS_WRITE) )
set_errno_and_return_minus_one( EINVAL ); rtems_set_errno_and_return_minus_one( EINVAL );
return 0; return 0;
} }
@@ -847,20 +843,20 @@ static int rtems_tftp_read(
tp->eof = (tp->nleft < TFTP_BUFSIZE); tp->eof = (tp->nleft < TFTP_BUFSIZE);
tp->blocknum++; tp->blocknum++;
if (sendAck (tp) != 0) if (sendAck (tp) != 0)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
break; break;
} }
if (opcode == TFTP_OPCODE_ERROR) if (opcode == TFTP_OPCODE_ERROR)
set_errno_and_return_minus_one( tftpErrno (tp) ); rtems_set_errno_and_return_minus_one( tftpErrno (tp) );
} }
/* /*
* Keep trying? * Keep trying?
*/ */
if (++retryCount == IO_RETRY_LIMIT) if (++retryCount == IO_RETRY_LIMIT)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
if (sendAck (tp) != 0) if (sendAck (tp) != 0)
set_errno_and_return_minus_one( EIO ); rtems_set_errno_and_return_minus_one( EIO );
} }
} }
return count - nwant; return count - nwant;
@@ -977,7 +973,7 @@ static int rtems_tftp_write(
int e = rtems_tftp_flush (tp); int e = rtems_tftp_flush (tp);
if (e) { if (e) {
tp->writing = 0; tp->writing = 0;
set_errno_and_return_minus_one (e); rtems_set_errno_and_return_minus_one (e);
} }
} }
} }