Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BugZilla: 4090. PR_APPEND

Browse Source
This commit is contained in:
larryh%netscape.com 2000-07-28 21:51:07 +00:00
parent e70fdaeb48
commit 9a9152b4cc
4 changed files with 181 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nsprpub/pr/include/private/primpl.h
View File

@ -1693,6 +1693,9 @@ struct PRFilePrivate {
char *peekBuffer;
PRInt32 peekBufSize;
PRInt32 peekBytes;
#endif
#if !defined(XP_UNIX) /* BugZilla: 4090 */
PRBool appendMode;
#endif
_MDFileDesc md;
};

24
nsprpub/pr/src/io/prfile.c
View File

@ -84,16 +84,24 @@ static PRInt32 PR_CALLBACK FileWrite(PRFileDesc *fd, const void *buf, PRInt32 am
if (_PR_PENDING_INTERRUPT(me)) {
me->flags &= ~_PR_INTERRUPT;
PR_SetError(PR_PENDING_INTERRUPT_ERROR, 0);
rv = -1;
rv = -1;
}
if (_PR_IO_PENDING(me)) {
PR_SetError(PR_IO_PENDING_ERROR, 0);
rv = -1;
rv = -1;
}
if (rv != 0)
return rv;
count = 0;
#if !defined(XP_UNIX) /* BugZilla: 4090 */
if ( PR_TRUE == fd->secret->appendMode ) {
rv = PR_Seek(fd, 0, PR_SEEK_END );
if ( -1 == rv ) {
return rv;
}
} /* if (fd->secret->appendMode...) */
#endif /* XP_UNIX */
while (amount > 0) {
temp = _PR_MD_WRITE(fd, buf, amount);
if (temp < 0) {
@ -349,6 +357,11 @@ PR_IMPLEMENT(PRFileDesc*) PR_Open(const char *name, PRIntn flags, PRIntn mode)
{
PRInt32 osfd;
PRFileDesc *fd = 0;
#if defined(XP_UNIX) /* BugZilla: 4090 */
PRBool appendMode = PR_FALSE;
#else
PRBool appendMode = ( PR_APPEND & flags )? PR_TRUE : PR_FALSE;
#endif
if (!_pr_initialized) _PR_ImplicitInitialization();
@ -360,6 +373,7 @@ PR_IMPLEMENT(PRFileDesc*) PR_Open(const char *name, PRIntn flags, PRIntn mode)
if (!fd) {
(void) _PR_MD_CLOSE_FILE(osfd);
} else {
fd->secret->appendMode = appendMode;
_PR_MD_INIT_FD_INHERITABLE(fd, PR_FALSE);
}
}
@ -371,6 +385,11 @@ PR_IMPLEMENT(PRFileDesc*) PR_OpenFile(
{
PRInt32 osfd;
PRFileDesc *fd = 0;
#if defined(XP_UNIX) /* BugZilla: 4090 */
PRBool appendMode = PR_FALSE;
#else
PRBool appendMode = ( PR_APPEND & flags )? PR_TRUE : PR_FALSE;
#endif
if (!_pr_initialized) _PR_ImplicitInitialization();
@ -382,6 +401,7 @@ PR_IMPLEMENT(PRFileDesc*) PR_OpenFile(
if (!fd) {
(void) _PR_MD_CLOSE_FILE(osfd);
} else {
fd->secret->appendMode = appendMode;
_PR_MD_INIT_FD_INHERITABLE(fd, PR_FALSE);
}
}

1
nsprpub/pr/tests/Makefile
View File

@ -60,6 +60,7 @@ CSRCS = \
affinity.c \
alarm.c \
anonfm.c \
append.c \
atomic.c \
attach.c \
bigfile.c \

155
nsprpub/pr/tests/append.c Normal file
View File

@ -0,0 +1,155 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is the Netscape Portable Runtime (NSPR).
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-2000 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL"), in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your
* version of this file only under the terms of the GPL and not to
* allow others to use your version of this file under the MPL,
* indicate your decision by deleting the provisions above and
* replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient
* may use your version of this file under either the MPL or the
* GPL.
*/
/*
** File: append.c
** Description: Testing File writes where PR_APPEND was used on open
**
** append attempts to verify that a file opened with PR_APPEND
** will always append to the end of file, regardless where the
** current file pointer is positioned. To do this, PR_Seek() is
** called before each write with the position set to beginning of
** file. Subsequent writes should always append.
** The file is read back, summing the integer data written to the
** file. If the expected result is equal, the test passes.
**
** See BugSplat: 4090
*/
#include "plgetopt.h"
#include "nspr.h"
#include <stdio.h>
#include <stdlib.h>
PRIntn debug = 0;
PRIntn verbose = 0;
PRBool failedAlready = PR_FALSE;
const PRInt32 addedBytes = 1000;
const PRInt32 buf = 1; /* constant written to fd, addedBytes times */
PRInt32 inBuf; /* read it back into here */
PRIntn main(PRIntn argc, char *argv[])
{
PRStatus rc;
PRInt32 rv;
PRFileDesc *fd;
PRIntn i;
PRInt32 sum = 0;
{ /* Get command line options */
PLOptStatus os;
PLOptState *opt = PL_CreateOptState(argc, argv, "vd");
while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
{
if (PL_OPT_BAD == os) continue;
switch (opt->option)
{
case 'd': /* debug */
debug = 1;
break;
case 'v': /* verbose */
verbose = 1;
break;
default:
break;
}
}
PL_DestroyOptState(opt);
} /* end block "Get command line options" */
/* ---------------------------------------------------------------------- */
fd = PR_Open( "/tmp/nsprAppend", (PR_APPEND | PR_CREATE_FILE | PR_TRUNCATE | PR_WRONLY), 0666 );
if ( NULL == fd ) {
if (debug) printf("PR_Open() failed for writing: %d\n", PR_GetError());
failedAlready = PR_TRUE;
goto Finished;
}
for ( i = 0; i < addedBytes ; i++ ) {
rv = PR_Write( fd, &buf, sizeof(buf));
if ( sizeof(buf) != rv ) {
if (debug) printf("PR_Write() failed: %d\n", PR_GetError());
failedAlready = PR_TRUE;
goto Finished;
}
rv = PR_Seek( fd, 0 , PR_SEEK_SET );
if ( -1 == rv ) {
if (debug) printf("PR_Seek() failed: %d\n", PR_GetError());
failedAlready = PR_TRUE;
goto Finished;
}
}
rc = PR_Close( fd );
if ( PR_FAILURE == rc ) {
if (debug) printf("PR_Close() failed after writing: %d\n", PR_GetError());
failedAlready = PR_TRUE;
goto Finished;
}
/* ---------------------------------------------------------------------- */
fd = PR_Open( "/tmp/nsprAppend", PR_RDONLY, 0 );
if ( NULL == fd ) {
if (debug) printf("PR_Open() failed for reading: %d\n", PR_GetError());
failedAlready = PR_TRUE;
goto Finished;
}
for ( i = 0; i < addedBytes ; i++ ) {
rv = PR_Read( fd, &inBuf, sizeof(inBuf));
if ( sizeof(inBuf) != rv) {
if (debug) printf("PR_Write() failed: %d\n", PR_GetError());
failedAlready = PR_TRUE;
goto Finished;
}
sum += inBuf;
}
rc = PR_Close( fd );
if ( PR_FAILURE == rc ) {
if (debug) printf("PR_Close() failed after reading: %d\n", PR_GetError());
failedAlready = PR_TRUE;
goto Finished;
}
if ( sum != addedBytes ) {
if (debug) printf("Uh Oh! addedBytes: %d. Sum: %d\n", addedBytes, sum);
failedAlready = PR_TRUE;
goto Finished;
}
/* ---------------------------------------------------------------------- */
Finished:
if (debug || verbose) printf("%s\n", (failedAlready)? "FAILED" : "PASSED" );
return( (failedAlready)? 1 : 0 );
} /* main() */
/* append.c */