RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-05 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix rados put from '-' (stdin)

Browse Source 
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Mike Ryan <mike.ryan@inktank.com>
Reviewed-by: Greg Farnum <gregory.farnum@inktank.com>
Fixes: #3068
This commit is contained in:
Dan Mick 2012-08-31 14:41:29 -07:00
parent b273c376ca
commit fb379174bf
1 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/rados.cc
View File

@ -327,48 +327,44 @@ static int do_put(IoCtx& io_ctx, const char *objname, const char *infile, int op
if (check_stdio && strcmp(infile, "-") == 0)
stdio = true;
if (stdio) {
char buf[256];
while(!cin.eof()) {
cin.getline(buf, 256);
indata.append(buf);
indata.append('\n');
}
} else {
int ret, fd = open(infile, O_RDONLY);
if (fd < 0) {
char buf[80];
cerr << "error reading input file " << infile << ": " << strerror_r(errno, buf, sizeof(buf)) << std::endl;
return 1;
}
char *buf = new char[op_size];
int count = op_size;
uint64_t offset = 0;
while (count == op_size) {
count = read(fd, buf, op_size);
if (count == 0) {
if (!offset) {
int ret = io_ctx.create(oid, true);
if (ret < 0)
cerr << "WARNING: could not create object: " << oid << std::endl;
}
continue;
}
indata.append(buf, count);
if (offset == 0)
ret = io_ctx.write_full(oid, indata);
else
ret = io_ctx.write(oid, indata, count, offset);
indata.clear();
if (ret < 0) {
close(fd);
return ret;
}
offset += count;
}
close(fd);
int ret;
int fd = 0;
if (!stdio)
fd = open(infile, O_RDONLY);
if (fd < 0) {
char buf[80];
cerr << "error reading input file " << infile << ": " << strerror_r(errno, buf, sizeof(buf)) << std::endl;
return 1;
}
char *buf = new char[op_size];
int count = op_size;
uint64_t offset = 0;
while (count != 0) {
count = read(fd, buf, op_size);
if (count == 0) {
if (!offset) {
int ret = io_ctx.create(oid, true);
if (ret < 0) {
cerr << "WARNING: could not create object: " << oid << std::endl;
return 1;
}
}
continue;
}
indata.append(buf, count);
if (offset == 0)
ret = io_ctx.write_full(oid, indata);
else
ret = io_ctx.write(oid, indata, count, offset);
indata.clear();
if (ret < 0) {
close(fd);
return ret;
}
offset += count;
}
close(fd);
return 0;
}