Apple-2-Tools
/
AppleCommander
mirror of https://github.com/AppleCommander/AppleCommander.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Normalize parameter order; accept 0xnnnn for start address.

This commit is contained in:
John B. Matthews 2008-05-18 21:03:25 +00:00
parent 2dd931a0a0
commit b403b3a4e9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/webcodepro/applecommander/ui/UiBundle.properties
View File

@ -100,7 +100,7 @@ CreateDirectoryMenuItem=Create Directory...
CommandLineErrorMessage = Error: {0}
CommandLineNoMatchMessage = {0}: No match.
CommandLineStatus = {0} format; {1} bytes free; {2} bytes used.
CommandLineHelp = AppleCommander command line options [{0}]:\n-i <imagename> display information about image.\n-ls <imagename> list brief directory of image.\n-l <imagename> list directory of image.\n-ll <imagename> list detailed directory of image.\n-e <filename> <imagename> export file from image to stdout.\n-g <filename> <imagename> get raw file from image to stdout.\n-p <destname> <type> <addr> <imagename> put stdin\n in destname on image, using file type and address.\n-d <filename> <imagename> delete file from image.\n-cc65 <destname> <type> <imagename> put stdin with cc65\n header in destname on image, using file type.\n-dos140 <imagename> create a 140K DOS 3.3 image.\n-pro140 <imagename> <volname> create a 140K ProDOS image.\n-pro800 <imagename> <volname> create a 800K ProDOS image.\n-pas140 <imagename> <volname> create a 140K Pascal image.
CommandLineHelp = AppleCommander command line options [{0}]:\n-i <imagename> display information about image.\n-ls <imagename> list brief directory of image.\n-l <imagename> list directory of image.\n-ll <imagename> list detailed directory of image.\n-e <imagename> <filename> export file from image to stdout.\n-g <imagename> <filename> get raw file from image to stdout.\n-p <imagename> <filename> <type> [$]<addr> put stdin\n in filename on image, using file type and address.\n-d <imagename> <filename> delete file from image.\n-cc65 <imagename> <filename> <type> put stdin with cc65 header\n in filename on image, using file type and address from header.\n-dos140 <imagename> create a 140K DOS 3.3 image.\n-pro140 <imagename> <volname> create a 140K ProDOS image.\n-pro800 <imagename> <volname> create a 800K ProDOS image.\n-pas140 <imagename> <volname> create a 140K Pascal image.
# UserPreferences

17
src/com/webcodepro/applecommander/ui/ac.java
View File

@ -91,8 +91,7 @@ public class ac {
* Put <stdin> into the file named fileName on the disk named imageName;
* Note: only volume level supported; input size unlimited.
*/
static void putFile(String fileName, String fileType,
String address, String imageName)
static void putFile(String imageName, String fileName, String fileType, String address)
throws IOException, DiskFullException {
ByteArrayOutputStream buf = new ByteArrayOutputStream();
@ -118,19 +117,19 @@ public class ac {
* Put <stdin> into the file named fileName on the disk named imageName;
* Assume a cc65 style four-byte header with start address in bytes 0-1.
*/
static void putCC65(String fileName, String fileType, String imageName)
static void putCC65(String imageName, String fileName, String fileType)
throws IOException, DiskFullException {
byte[] header = new byte[4];
int byteCount = System.in.read(header, 0, 4);
int address = AppleUtil.getWordValue(header, 0);
putFile(fileName, fileType, Integer.toString(address), imageName);
putFile(imageName, fileName, fileType, Integer.toString(address));
}
/**
* Delete the file named fileName from the disk named imageName.
*/
static void deleteFile(String fileName, String imageName) throws IOException {
static void deleteFile(String imageName, String fileName) throws IOException {
Disk disk = new Disk(imageName);
FormattedDisk[] formattedDisks = disk.getFormattedDisks();
for (int i=0; i<formattedDisks.length; i++) {
@ -151,7 +150,7 @@ public class ac {
* Get the file named filename from the disk named imageName;
* the file is filtered according to its type and sent to <stdout>.
*/
static void getFile(String fileName, String imageName, boolean filter) throws IOException {
static void getFile(String imageName, String fileName, boolean filter) throws IOException {
Disk disk = new Disk(imageName);
FormattedDisk[] formattedDisks = disk.getFormattedDisks();
for (int i=0; i<formattedDisks.length; i++) {
@ -303,9 +302,11 @@ public class ac {
static int stringToInt(String s) {
int i = 0;
try {
s = s.trim();
if (s.startsWith("$")) {
s = s.trim().toLowerCase();
if (s.startsWith("$")) { // 6502, Motorola
i = Integer.parseInt(s.substring(1), 0x10);
} else if (s.startsWith("0x")) { // Java, C
i = Integer.parseInt(s.substring(2), 0x10);
} else {
i = Integer.parseInt(s);
}