Minor o/p chnages.

1 files changed, 21 insertions, 9 deletions

diff --git a/calb.c b/calb.c
index 154c235..2ef7a7b 100644
--- a/calb.c
+++ b/calb.c
@@ -372,9 +372,23 @@ int main(int argc, char **argv)
 
 	opterr = 0;
 
-	while ((opt = getopt (argc, argv, "cs:")) != -1) {
+	while ((opt = getopt (argc, argv, "hc:s:")) != -1) {
 		switch (opt) {
 		case 'c':
+			if (*optarg == '-') {
+				printf("-ve values not accepted for conversion\n");
+				return 1;
+			}
+
+			printf("CONVERSION\n");
+			if (*optarg == '0' && tolower(*(optarg + 1)) == 'b') {
+				printf("binary");
+			} else {
+				ull val = strtoull(optarg, NULL, 0);
+				printf("\tbin: 0b\n");
+				printf("\tdec: %llu\n", val);
+				printf("\thex: 0x%llx\n", val);
+			}
 			break;
 		case 'h':
 			usage();
@@ -387,11 +401,7 @@ int main(int argc, char **argv)
 			}
 			break;
 		default:
-			if (isprint (optopt))
-				fprintf(stderr, "Unknown option `-%c'\n", optopt);
-			else
-				fprintf(stderr, "Unknown option\n");
-
+			usage();
 			return 1;
 		}
 	}
@@ -419,6 +429,8 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
+		printf("UNITS\n");
+
 		switch (count) {
 		case 0:
 			bytes = convertbyte(argv[optind]);
@@ -452,12 +464,12 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		printf("\n\naddress (dec): %llu\naddress (hex): 0x%llx\n\n", bytes, bytes);
+		printf("\n\nADDRESS\n\tdec: %llu\n\thex: 0x%llx\n\n", bytes, bytes);
 
-		printf("sector size: 0x%lx\n\n", sectorsize);
 		lba = bytes / sectorsize;
 		offset = bytes % sectorsize;
-		printf("LBA:offset (dec): %llu:%llu\nLBA:offset (hex): 0x%llx:0x%llx\n",
+		printf("LBA:OFFSET\n\tsector size: 0x%lx\n", sectorsize);
+		printf("\n\tdec: %llu:%llu\n\thex: 0x%llx:0x%llx\n",
 			lba, offset, lba, offset);
 	}