Differences From Artifact [8363b05eea]:
- File src/file.c — part of check-in [f1c55cc298] at 2012-09-30 01:10:59 on branch trunk — Make glibc happy. (user: js, size: 4645) [annotate] [blame] [check-ins using]
To Artifact [7ba5522f8b]:
- File
src/file.c
— part of check-in
[6893b9f5ab]
at
2012-09-30 01:34:46
on branch trunk
— Rename eof to at_end.
This is more fitting as end of file is not really true for a socket. (user: js, size: 4675) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
53 54 55 56 57 58 59 |
#endif
#define DEFAULT_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
struct CFWFile {
CFWStream stream;
int fd;
| | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 |
#endif
#define DEFAULT_MODE S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH
struct CFWFile {
CFWStream stream;
int fd;
bool at_end;
};
static int
parse_mode(const char *mode)
{
if (!strcmp(mode, "r"))
return O_RDONLY;
|
| ︙ | ︙ | |||
94 95 96 97 98 99 100 |
static ssize_t
file_read(void *ptr, void *buf, size_t len)
{
CFWFile *file = ptr;
ssize_t ret;
if ((ret = read(file->fd, buf, len)) == 0)
| | | | | | | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 |
static ssize_t
file_read(void *ptr, void *buf, size_t len)
{
CFWFile *file = ptr;
ssize_t ret;
if ((ret = read(file->fd, buf, len)) == 0)
file->at_end = true;
return ret;
}
static bool
file_write(void *ptr, const void *buf, size_t len)
{
CFWFile *file = ptr;
ssize_t ret;
if ((ret = write(file->fd, buf, len)) < len)
return false;
return true;
}
static bool
file_at_end(void *ptr)
{
CFWFile *file = ptr;
return file->at_end;
}
static void
file_close(void *ptr)
{
CFWFile *file = ptr;
close(file->fd);
}
static struct cfw_stream_ops stream_ops = {
.read = file_read,
.write = file_write,
.at_end = file_at_end,
.close = file_close
};
static bool
ctor(void *ptr, va_list args)
{
CFWFile *file = ptr;
const char *path = va_arg(args, const char*);
const char *mode = va_arg(args, const char*);
int flags;
/* Make sure we have a valid file in case we error out */
cfw_stream->ctor(ptr, args);
file->at_end = false;
if ((flags = parse_mode(mode)) == -1)
return false;
if ((file->fd = open(path, flags, DEFAULT_MODE)) == -1)
return false;
|
| ︙ | ︙ | |||
180 181 182 183 184 185 186 |
.obj = {
.cls = &class,
.ref_cnt = INT_MAX
},
.ops = &stream_ops
},
.fd = 0,
| | | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 |
.obj = {
.cls = &class,
.ref_cnt = INT_MAX
},
.ops = &stream_ops
},
.fd = 0,
.at_end = false
};
static CFWFile cfw_stdout_ = {
.stream = {
.obj = {
.cls = &class,
.ref_cnt = INT_MAX
},
.ops = &stream_ops
},
.fd = 1,
.at_end = false
};
static CFWFile cfw_stderr_ = {
.stream = {
.obj = {
.cls = &class,
.ref_cnt = INT_MAX
},
.ops = &stream_ops
},
.fd = 2,
.at_end = false
};
CFWFile *cfw_stdin = &cfw_stdin_;
CFWFile *cfw_stdout = &cfw_stdout_;
CFWFile *cfw_stderr = &cfw_stderr_;
|