traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: added instann rules and $(*DEST*) defines. 

fileobject.c: report more moeaningful error for I/O on closed files;
user getargs() everywhere.
This commit is contained in:
Guido van Rossum 1992-07-06 14:19:26 +00:00
parent 3ee199e0cd
commit d7297e61df
1 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Objects/fileobject.c
View File

@ -47,7 +47,7 @@ FILE *
getfilefile(f) getfilefile(f)
object *f; object *f;
{ {
if (!is_fileobject(f)) { if (!is_fileobject(f) || ((fileobject *)f)->f_fp == NULL) {
err_badcall(); err_badcall();
return NULL; return NULL;
} }
@ -102,6 +102,13 @@ newfileobject(name, mode)
return (object *)f; return (object *)f;
} }
static object *
err_closed()
{
err_setstr(ValueError, "I/O operation on closed file");
return NULL;
}
/* Methods */ /* Methods */
static void static void
@ -153,10 +160,8 @@ file_close(f, args)
object *args; object *args;
{ {
int sts = 0; int sts = 0;
if (args != NULL) { if (!getnoarg(args))
err_badarg();
return NULL; return NULL;
}
errno = 0; errno = 0;
if (f->f_fp != NULL) { if (f->f_fp != NULL) {
if (f->f_close != NULL) if (f->f_close != NULL)
@ -177,22 +182,18 @@ file_seek(f, args)
object *args; object *args;
{ {
long offset; long offset;
long whence; int whence;
if (f->f_fp == NULL) { if (f->f_fp == NULL)
err_badarg(); return err_closed();
return NULL; whence = 0;
} if (!getargs(args, "l", &offset)) {
if (args != NULL && is_intobject(args)) { err_clear();
offset = getintvalue(args); if (!getargs(args, "(li)", &offset, &whence))
whence = 0; /* SEEK_SET */
}
else {
if (!getlonglongarg(args, &offset, &whence))
return NULL; return NULL;
} }
errno = 0; errno = 0;
if (fseek(f->f_fp, offset, (int)whence) != 0) { if (fseek(f->f_fp, offset, whence) != 0) {
err_errno(IOError); err_errno(IOError);
clearerr(f->f_fp); clearerr(f->f_fp);
return NULL; return NULL;
@ -207,10 +208,10 @@ file_tell(f, args)
object *args; object *args;
{ {
long offset; long offset;
if (args != NULL || f->f_fp == NULL) { if (f->f_fp == NULL)
err_badarg(); return err_closed();
if (!getnoarg(args))
return NULL; return NULL;
}
errno = 0; errno = 0;
offset = ftell(f->f_fp); offset = ftell(f->f_fp);
if (offset == -1L) { if (offset == -1L) {
@ -226,6 +227,8 @@ file_fileno(f, args)
fileobject *f; fileobject *f;
object *args; object *args;
{ {
if (f->f_fp == NULL)
return err_closed();
if (!getnoarg(args)) if (!getnoarg(args))
return NULL; return NULL;
return newintobject((long) fileno(f->f_fp)); return newintobject((long) fileno(f->f_fp));
@ -236,10 +239,10 @@ file_flush(f, args)
fileobject *f; fileobject *f;
object *args; object *args;
{ {
if (args != NULL || f->f_fp == NULL) { if (f->f_fp == NULL)
err_badarg(); return err_closed();
if (!getnoarg(args))
return NULL; return NULL;
}
errno = 0; errno = 0;
if (fflush(f->f_fp) != 0) { if (fflush(f->f_fp) != 0) {
err_errno(IOError); err_errno(IOError);
@ -255,10 +258,10 @@ file_isatty(f, args)
fileobject *f; fileobject *f;
object *args; object *args;
{ {
if (args != NULL || f->f_fp == NULL) { if (f->f_fp == NULL)
err_badarg(); return err_closed();
if (!getnoarg(args))
return NULL; return NULL;
}
return newintobject((long)isatty((int)fileno(f->f_fp))); return newintobject((long)isatty((int)fileno(f->f_fp)));
} }
@ -270,20 +273,17 @@ file_read(f, args)
int n, n1, n2, n3; int n, n1, n2, n3;
object *v; object *v;
if (f->f_fp == NULL) { if (f->f_fp == NULL)
err_badarg(); return err_closed();
return NULL; if (args == NULL) {
}
if (args == 0)
n = 0; n = 0;
else {
if (!getintarg(args, &n))
return NULL;
if (n < 0) { if (n < 0) {
err_badarg(); err_setstr(ValueError, "negative read count");
return NULL; return NULL;
} }
} }
else if (!getargs(args, "i", &n))
return NULL;
n2 = n != 0 ? n : BUFSIZ; n2 = n != 0 ? n : BUFSIZ;
v = newsizedstringobject((char *)NULL, n2); v = newsizedstringobject((char *)NULL, n2);
@ -327,11 +327,6 @@ getline(f, n)
int n1, n2; int n1, n2;
object *v; object *v;
if ((fp = f->f_fp) == NULL) {
err_badarg();
return NULL;
}
n2 = n > 0 ? n : 100; n2 = n > 0 ? n : 100;
v = newsizedstringobject((char *)NULL, n2); v = newsizedstringobject((char *)NULL, n2);
if (v == NULL) if (v == NULL)
@ -389,6 +384,8 @@ filegetline(f, n)
err_badcall(); err_badcall();
return NULL; return NULL;
} }
if (((fileobject*)f)->f_fp == NULL)
return err_closed();
return getline((fileobject *)f, n); return getline((fileobject *)f, n);
} }
@ -401,13 +398,15 @@ file_readline(f, args)
{ {
int n; int n;
if (f->f_fp == NULL)
return err_closed();
if (args == NULL) if (args == NULL)
n = 0; /* Unlimited */ n = 0; /* Unlimited */
else { else {
if (!getintarg(args, &n)) if (!getintarg(args, &n))
return NULL; return NULL;
if (n < 0) { if (n < 0) {
err_badarg(); err_setstr(ValueError, "negative readline count");
return NULL; return NULL;
} }
} }
@ -423,6 +422,8 @@ file_readlines(f, args)
object *list; object *list;
object *line; object *line;
if (f->f_fp == NULL)
return err_closed();
if (!getnoarg(args)) if (!getnoarg(args))
return NULL; return NULL;
if ((list = newlistobject(0)) == NULL) if ((list = newlistobject(0)) == NULL)
@ -448,18 +449,15 @@ file_write(f, args)
fileobject *f; fileobject *f;
object *args; object *args;
{ {
char *s;
int n, n2; int n, n2;
if (f->f_fp == NULL) { if (f->f_fp == NULL)
err_badarg(); return err_closed();
if (!getargs(args, "s#", &s, &n))
return NULL; return NULL;
}
if (args == NULL || !is_stringobject(args)) {
err_badarg();
return NULL;
}
f->f_softspace = 0; f->f_softspace = 0;
errno = 0; errno = 0;
n2 = fwrite(getstringvalue(args), 1, n = getstringsize(args), f->f_fp); n2 = fwrite(s, 1, n, f->f_fp);
if (n2 != n) { if (n2 != n) {
err_errno(IOError); err_errno(IOError);
clearerr(f->f_fp); clearerr(f->f_fp);