Apple-2-Tools/profuse
1
0
Fork 0
mirror of https://github.com/ksherlock/profuse.git synced 2025-01-10 23:29:42 +00:00
Code Issues Projects Releases Wiki Activity

put

Browse Source 
git-svn-id: https://profuse.googlecode.com/svn/branches/v2@302 aa027e90-d47c-11dd-86d7-074df07e0730
This commit is contained in:
ksherlock 2010-05-30 21:57:55 +00:00
parent e2b20ccfba
commit e66058320f
1 changed files with 64 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
apfm.cpp
View File

@ -752,7 +752,6 @@ int action_get(int argc, char **argv, Pascal::VolumeEntry *volume)
return 0; return 0;
} }
#if 0
int action_put(int argc, char **argv, Pascal::VolumeEntry *volume) int action_put(int argc, char **argv, Pascal::VolumeEntry *volume)
{ {
// put [-t type] native_file [pascal_file] // put [-t type] native_file [pascal_file]
@ -765,12 +764,16 @@ int action_put(int argc, char **argv, Pascal::VolumeEntry *volume)
char *infile; char *infile;
char *outfile; char *outfile;
char *tmp; char *tmp;
bool iFlag = ::isatty(STDIN_FILENO);
bool tFlag = false;
while ((c = getopt(argc, argv, "t:")) != -1) while ((c = getopt(argc, argv, "fhit:")) != -1)
{ {
switch (c) switch (c)
{ {
case 't': case 't':
tFlag = true;
if (!::strcasecmp("text", optarg)) if (!::strcasecmp("text", optarg))
type = Pascal::kTextFile; type = Pascal::kTextFile;
else if (!::strcasecmp("txt", optarg)) else if (!::strcasecmp("txt", optarg))
@ -788,11 +791,21 @@ int action_put(int argc, char **argv, Pascal::VolumeEntry *volume)
else type = Pascal::kUntypedFile; else type = Pascal::kUntypedFile;
break; break;
case 'i':
iFlag = true;
break;
case 'f':
iFlag = false;
break;
case 'h':
default:
commandUsage(kCommandPUT);
return c == 'h' ? 0 : -1;
} }
} }
// TODO -- if file is named .txt or .text, default to kTextFile.
argc -= optind; argc -= optind;
argv += optind; argv += optind;
@ -812,12 +825,34 @@ int action_put(int argc, char **argv, Pascal::VolumeEntry *volume)
break; break;
} }
// if no tFlag specified, check .text/.txt
if (!tFlag)
{
tmp = strrchr(outfile, '.');
if (tmp)
{
if (::strcasecmp(tmp, ".text") == 0 || strcasecmp(tmp, ".txt") == 0)
type = Pascal::kTextFile;
}
}
if (!Pascal::FileEntry::ValidName(outfile)) if (!Pascal::FileEntry::ValidName(outfile))
{ {
std::fprintf(stderr, "apfm put: `%s' is not a valid pascal name.\n", outfile); std::fprintf(stderr, "apfm put: `%s' is not a valid pascal name.\n", outfile);
} }
::stat(infile, &st); if (::stat(infile, &st) != 0)
{
std::fprintf(stderr, "apfm put: %s: no such file.\n", infile);
return 1;
}
if (!S_ISREG(st.st_mode))
{
std::fprintf(stderr, "apfm put: %s: not a regular file.\n", infile);
return -1;
}
File::File file(infile, O_RDONLY); File::File file(infile, O_RDONLY);
@ -826,9 +861,14 @@ int action_put(int argc, char **argv, Pascal::VolumeEntry *volume)
// TODO -- if text file, .. // TODO -- if text file, ..
Pascal::FileEntry *entry = volume.createFile(infile, blocks); Pascal::FileEntry *entry = volume->create(infile, blocks);
if (!entry)
{
perror(NULL);
return -1;
}
entry->setType(type); entry->setFileKind(type);
if (type == Pascal::kTextFile) if (type == Pascal::kTextFile)
{ {
@ -836,14 +876,30 @@ int action_put(int argc, char **argv, Pascal::VolumeEntry *volume)
} }
else else
{ {
// ... uint8_t buffer[512];
unsigned remaining = st.st_size;
unsigned offset = 0;
while (remaining)
{
int rv;
unsigned count = std::min(512u, remaining);
::read(file.fd(), buffer, count);
rv = entry->write(buffer, count, offset);
if (rv == -1)
{
perror(NULL);
return -1;
}
offset += count;
remaining -= count;
}
} }
volume->sync();
return 0; return 0;
} }
#endif