diff --git a/rosapps/applications/cmdutils/touch/touch.c b/rosapps/applications/cmdutils/touch/touch.c index 80a99c4a29c..257eaeac176 100644 --- a/rosapps/applications/cmdutils/touch/touch.c +++ b/rosapps/applications/cmdutils/touch/touch.c @@ -146,9 +146,9 @@ main(int argc, char *argv[]) if (stat(*argv, &sb)) { if (!cflag) { /* Create the file. */ - fd = open(*argv, + fd = _open(*argv, O_WRONLY | O_CREAT, DEFFILEMODE); - if (fd == -1 || fstat(fd, &sb) || close(fd)) { + if (fd == -1 || fstat(fd, &sb) || _close(fd)) { rval = 1; warn("%s", *argv); continue; @@ -300,37 +300,37 @@ rw(char *fname, struct stat *sbp, int force) } needed_chmod = rval = 0; - if ((fd = open(fname, O_RDWR, 0)) == -1) { - if (!force || chmod(fname, DEFFILEMODE)) + if ((fd = _open(fname, O_RDWR, 0)) == -1) { + if (!force || _chmod(fname, DEFFILEMODE)) goto err; - if ((fd = open(fname, O_RDWR, 0)) == -1) + if ((fd = _open(fname, O_RDWR, 0)) == -1) goto err; needed_chmod = 1; } if (sbp->st_size != 0) { - if (read(fd, &byte, sizeof(byte)) != sizeof(byte)) + if (_read(fd, &byte, sizeof(byte)) != sizeof(byte)) goto err; - if (lseek(fd, (off_t)0, SEEK_SET) == -1) + if (_lseek(fd, (off_t)0, SEEK_SET) == -1) goto err; - if (write(fd, &byte, sizeof(byte)) != sizeof(byte)) + if (_write(fd, &byte, sizeof(byte)) != sizeof(byte)) goto err; } else { - if (write(fd, &byte, sizeof(byte)) != sizeof(byte)) { + if (_write(fd, &byte, sizeof(byte)) != sizeof(byte)) { err: rval = 1; warn("%s", fname); /* } else if (ftruncate(fd, (off_t)0)) {*/ - } else if (chsize(fd, (off_t)0)) { + } else if (_chsize(fd, (off_t)0)) { rval = 1; warn("%s: file modified", fname); } } - if (close(fd) && rval != 1) { + if (_close(fd) && rval != 1) { rval = 1; warn("%s", fname); } - if (needed_chmod && chmod(fname, sbp->st_mode) && rval != 1) { + if (needed_chmod && _chmod(fname, sbp->st_mode) && rval != 1) { rval = 1; warn("%s: permissions modified", fname); } diff --git a/rosapps/applications/net/ncftp/libncftp/open.c b/rosapps/applications/net/ncftp/libncftp/open.c index 7c247633fdb..f3854edd5fc 100644 --- a/rosapps/applications/net/ncftp/libncftp/open.c +++ b/rosapps/applications/net/ncftp/libncftp/open.c @@ -1075,14 +1075,14 @@ FTPRebuildConnectionInfo(const FTPLIPtr lip, const FTPCIPtr cip) /* Reattach the FILE pointers for use with the Std I/O library * routines. */ - if ((cip->cin = fdopen(cip->ctrlSocketR, "r")) == NULL) { + if ((cip->cin = _fdopen(cip->ctrlSocketR, "r")) == NULL) { cip->errNo = kErrFdopenR; cip->ctrlSocketR = kClosedFileDescriptor; cip->ctrlSocketW = kClosedFileDescriptor; return (kErrFdopenR); } - if ((cip->cout = fdopen(cip->ctrlSocketW, "w")) == NULL) { + if ((cip->cout = _fdopen(cip->ctrlSocketW, "w")) == NULL) { CloseFile(&cip->cin); cip->errNo = kErrFdopenW; cip->ctrlSocketR = kClosedFileDescriptor; diff --git a/rosapps/applications/net/ncftp/ncftp/bookmark.c b/rosapps/applications/net/ncftp/ncftp/bookmark.c index d616db0a771..e42eaee52e2 100644 --- a/rosapps/applications/net/ncftp/ncftp/bookmark.c +++ b/rosapps/applications/net/ncftp/ncftp/bookmark.c @@ -297,7 +297,7 @@ OpenBookmarkFile(int *numBookmarks0) return NULL; /* Okay to not have one yet. */ } - (void) chmod(pathName, 00600); + (void) _chmod(pathName, 00600); if (FGets(line, sizeof(line), fp) == NULL) { (void) fprintf(stderr, "%s: invalid format.\n", pathName); (void) fclose(fp); @@ -683,7 +683,7 @@ OpenTmpBookmarkFile(int nb) perror(pathName); return (NULL); } - (void) chmod(pathName, 00600); + (void) _chmod(pathName, 00600); if (nb > 0) { if (fprintf(outfp, "NcFTP bookmark-file version: %d\nNumber of bookmarks: %d\n", kBookmarkVersion, nb) < 0) { (void) fprintf(stderr, "Could not save bookmark.\n"); diff --git a/rosapps/applications/net/ncftp/ncftp/cmds.c b/rosapps/applications/net/ncftp/ncftp/cmds.c index 574c84bedcc..b8b8d300933 100644 --- a/rosapps/applications/net/ncftp/ncftp/cmds.c +++ b/rosapps/applications/net/ncftp/ncftp/cmds.c @@ -2540,7 +2540,7 @@ PageCmd(const int argc, const char **const argv, const CommandPtr cmdp, const Ar #endif for (i=1; i= 0) /* file exists */ + if (_access(buffer, 0) >= 0) /* file exists */ { printf("File %s already exists, overwrite? (Y)es, (N)o, (A)bort", buffer); do