Changeset 84876aa4 in mainline for uspace/app/fdisk/fdisk.c
- Timestamp:
- 2019-11-15T13:46:34Z (4 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ecb7828
- Parents:
- b093a62 (diff), d548fc0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/fdisk/fdisk.c
rb093a62 r84876aa4 34 34 */ 35 35 36 #include <cap .h>36 #include <capa.h> 37 37 #include <errno.h> 38 38 #include <fdisk.h> … … 136 136 nchoice_t *choice = NULL; 137 137 char *svcname = NULL; 138 cap _spec_t cap;138 capa_spec_t capa; 139 139 fdisk_dev_info_t *sdev; 140 char *scap = NULL;140 char *scapa = NULL; 141 141 char *dtext = NULL; 142 142 service_id_t svcid; … … 177 177 } 178 178 179 rc = fdisk_dev_info_capacity(info, &cap );179 rc = fdisk_dev_info_capacity(info, &capa); 180 180 if (rc != EOK) { 181 181 printf("Error getting device capacity " … … 185 185 } 186 186 187 cap _simplify(&cap);188 189 rc = cap _format(&cap, &scap);187 capa_simplify(&capa); 188 189 rc = capa_format(&capa, &scapa); 190 190 if (rc != EOK) { 191 191 assert(rc == ENOMEM); … … 194 194 } 195 195 196 int ret = asprintf(&dtext, "%s (%s)", svcname, scap );196 int ret = asprintf(&dtext, "%s (%s)", svcname, scapa); 197 197 if (ret < 0) { 198 198 rc = ENOMEM; … … 203 203 free(svcname); 204 204 svcname = NULL; 205 free(scap );206 scap = NULL;205 free(scapa); 206 scapa = NULL; 207 207 208 208 rc = nchoice_add(choice, dtext, info, 0); … … 261 261 free(dtext); 262 262 free(svcname); 263 free(scap );263 free(scapa); 264 264 return rc; 265 265 } … … 432 432 errno_t rc; 433 433 fdisk_part_spec_t pspec; 434 cap _spec_t cap;435 cap _spec_t mcap;434 capa_spec_t capa; 435 capa_spec_t mcapa; 436 436 vol_label_supp_t vlsupp; 437 437 vol_fstype_t fstype = 0; 438 438 tinput_t *tinput = NULL; 439 439 fdisk_spc_t spc; 440 char *scap ;441 char *smcap = NULL;440 char *scapa; 441 char *smcapa = NULL; 442 442 char *label = NULL; 443 443 char *mountp = NULL; … … 448 448 spc = spc_pri; 449 449 450 rc = fdisk_part_get_max_avail(dev, spc, &mcap );450 rc = fdisk_part_get_max_avail(dev, spc, &mcapa); 451 451 if (rc != EOK) { 452 452 rc = EIO; … … 454 454 } 455 455 456 cap _simplify(&mcap);457 458 rc = cap _format(&mcap, &smcap);456 capa_simplify(&mcapa); 457 458 rc = capa_format(&mcapa, &smcapa); 459 459 if (rc != EOK) { 460 460 rc = ENOMEM; … … 474 474 while (true) { 475 475 printf("Enter capacity of new partition.\n"); 476 rc = tinput_read_i(tinput, smcap , &scap);476 rc = tinput_read_i(tinput, smcapa, &scapa); 477 477 if (rc != EOK) 478 478 goto error; 479 479 480 rc = cap _parse(scap, &cap);480 rc = capa_parse(scapa, &capa); 481 481 if (rc == EOK) 482 482 break; … … 485 485 tinput_destroy(tinput); 486 486 tinput = NULL; 487 free(smcap );488 smcap = NULL;487 free(smcapa); 488 smcapa = NULL; 489 489 490 490 if (pkind != lpk_extended) { … … 545 545 546 546 fdisk_pspec_init(&pspec); 547 pspec.capacity = cap ;547 pspec.capacity = capa; 548 548 pspec.pkind = pkind; 549 549 pspec.fstype = fstype; … … 561 561 return EOK; 562 562 error: 563 free(smcap );563 free(smcapa); 564 564 free(label); 565 565 free(mountp); … … 581 581 fdisk_part_t *part; 582 582 fdisk_part_info_t pinfo; 583 char *scap = NULL;583 char *scapa = NULL; 584 584 char *spkind = NULL; 585 585 char *sfstype = NULL; … … 596 596 } 597 597 598 cap _simplify(&pinfo.capacity);599 600 rc = cap _format(&pinfo.capacity, &scap);598 capa_simplify(&pinfo.capacity); 599 600 rc = capa_format(&pinfo.capacity, &scapa); 601 601 if (rc != EOK) { 602 602 printf("Out of memory.\n"); … … 623 623 624 624 int ret = asprintf(&sdesc, "%s %s, %s, %s", label, 625 scap , spkind, sfstype);625 scapa, spkind, sfstype); 626 626 if (ret < 0) { 627 627 rc = ENOMEM; … … 630 630 631 631 } else { 632 int ret = asprintf(&sdesc, "%s, %s", scap , spkind);632 int ret = asprintf(&sdesc, "%s, %s", scapa, spkind); 633 633 if (ret < 0) { 634 634 rc = ENOMEM; … … 644 644 } 645 645 646 free(scap );647 scap = NULL;646 free(scapa); 647 scapa = NULL; 648 648 free(spkind); 649 649 spkind = NULL; … … 658 658 return EOK; 659 659 error: 660 free(scap );660 free(scapa); 661 661 free(spkind); 662 662 free(sfstype); … … 907 907 fdisk_part_t *part; 908 908 fdisk_part_info_t pinfo; 909 cap _spec_t cap;910 cap _spec_t mcap;909 capa_spec_t capa; 910 capa_spec_t mcapa; 911 911 fdisk_dev_flags_t dflags; 912 912 char *sltype = NULL; 913 char *sdcap = NULL;914 char *scap = NULL;915 char *smcap = NULL;913 char *sdcapa = NULL; 914 char *scapa = NULL; 915 char *smcapa = NULL; 916 916 char *sfstype = NULL; 917 917 char *svcname = NULL; … … 936 936 } 937 937 938 rc = fdisk_dev_capacity(dev, &cap );938 rc = fdisk_dev_capacity(dev, &capa); 939 939 if (rc != EOK) { 940 940 printf("Error getting device capacity.\n"); … … 942 942 } 943 943 944 cap _simplify(&cap);945 946 rc = cap _format(&cap, &sdcap);944 capa_simplify(&capa); 945 946 rc = capa_format(&capa, &sdcapa); 947 947 if (rc != EOK) { 948 948 printf("Out of memory.\n"); … … 958 958 fdisk_dev_get_flags(dev, &dflags); 959 959 960 printf("Device: %s (%s)\n", svcname, sdcap );961 free(sdcap );962 sdcap = NULL;960 printf("Device: %s (%s)\n", svcname, sdcapa); 961 free(sdcapa); 962 sdcapa = NULL; 963 963 964 964 rc = fdisk_label_get_info(dev, &linfo); … … 996 996 } 997 997 998 cap _simplify(&pinfo.capacity);999 1000 rc = cap _format(&pinfo.capacity, &scap);998 capa_simplify(&pinfo.capacity); 999 1000 rc = capa_format(&pinfo.capacity, &scapa); 1001 1001 if (rc != EOK) { 1002 1002 printf("Out of memory.\n"); … … 1016 1016 1017 1017 if (linfo.ltype == lt_none) 1018 printf("Entire disk: %s %s", label, scap );1018 printf("Entire disk: %s %s", label, scapa); 1019 1019 else 1020 printf("Partition %d: %s %s", npart, label, scap );1020 printf("Partition %d: %s %s", npart, label, scapa); 1021 1021 1022 1022 if ((linfo.flags & lf_ext_supp) != 0) { … … 1037 1037 printf("\n"); 1038 1038 1039 free(scap );1040 scap = NULL;1039 free(scapa); 1040 scapa = NULL; 1041 1041 free(sfstype); 1042 1042 sfstype = NULL; … … 1047 1047 /* Display available space */ 1048 1048 if ((linfo.flags & lf_can_create_pri) != 0) { 1049 rc = fdisk_part_get_max_avail(dev, spc_pri, &mcap );1049 rc = fdisk_part_get_max_avail(dev, spc_pri, &mcapa); 1050 1050 if (rc != EOK) { 1051 1051 rc = EIO; … … 1053 1053 } 1054 1054 1055 cap _simplify(&mcap);1056 1057 rc = cap _format(&mcap, &smcap);1055 capa_simplify(&mcapa); 1056 1057 rc = capa_format(&mcapa, &smcapa); 1058 1058 if (rc != EOK) { 1059 1059 rc = ENOMEM; … … 1062 1062 1063 1063 if ((linfo.flags & lf_ext_supp) != 0) 1064 printf("Maximum free primary block: %s\n", smcap );1064 printf("Maximum free primary block: %s\n", smcapa); 1065 1065 else 1066 printf("Maximum free block: %s\n", smcap );1067 1068 free(smcap );1069 smcap = NULL;1070 1071 rc = fdisk_part_get_tot_avail(dev, spc_pri, &mcap );1066 printf("Maximum free block: %s\n", smcapa); 1067 1068 free(smcapa); 1069 smcapa = NULL; 1070 1071 rc = fdisk_part_get_tot_avail(dev, spc_pri, &mcapa); 1072 1072 if (rc != EOK) { 1073 1073 rc = EIO; … … 1075 1075 } 1076 1076 1077 cap _simplify(&mcap);1078 1079 rc = cap _format(&mcap, &smcap);1077 capa_simplify(&mcapa); 1078 1079 rc = capa_format(&mcapa, &smcapa); 1080 1080 if (rc != EOK) { 1081 1081 rc = ENOMEM; … … 1084 1084 1085 1085 if ((linfo.flags & lf_ext_supp) != 0) 1086 printf("Total free primary space: %s\n", smcap );1086 printf("Total free primary space: %s\n", smcapa); 1087 1087 else 1088 printf("Total free space: %s\n", smcap );1089 1090 free(smcap );1091 smcap = NULL;1088 printf("Total free space: %s\n", smcapa); 1089 1090 free(smcapa); 1091 smcapa = NULL; 1092 1092 } 1093 1093 1094 1094 /* Display available space */ 1095 1095 if ((linfo.flags & lf_can_create_log) != 0) { 1096 rc = fdisk_part_get_max_avail(dev, spc_log, &mcap );1096 rc = fdisk_part_get_max_avail(dev, spc_log, &mcapa); 1097 1097 if (rc != EOK) { 1098 1098 rc = EIO; … … 1100 1100 } 1101 1101 1102 cap _simplify(&mcap);1103 1104 rc = cap _format(&mcap, &smcap);1102 capa_simplify(&mcapa); 1103 1104 rc = capa_format(&mcapa, &smcapa); 1105 1105 if (rc != EOK) { 1106 1106 rc = ENOMEM; … … 1108 1108 } 1109 1109 1110 printf("Maximum free logical block: %s\n", smcap );1111 free(smcap );1112 smcap = NULL;1113 1114 rc = fdisk_part_get_tot_avail(dev, spc_log, &mcap );1110 printf("Maximum free logical block: %s\n", smcapa); 1111 free(smcapa); 1112 smcapa = NULL; 1113 1114 rc = fdisk_part_get_tot_avail(dev, spc_log, &mcapa); 1115 1115 if (rc != EOK) { 1116 1116 rc = EIO; … … 1118 1118 } 1119 1119 1120 cap _simplify(&mcap);1121 1122 rc = cap _format(&mcap, &smcap);1120 capa_simplify(&mcapa); 1121 1122 rc = capa_format(&mcapa, &smcapa); 1123 1123 if (rc != EOK) { 1124 1124 rc = ENOMEM; … … 1126 1126 } 1127 1127 1128 printf("Total free logical space: %s\n", smcap );1129 free(smcap );1130 smcap = NULL;1128 printf("Total free logical space: %s\n", smcapa); 1129 free(smcapa); 1130 smcapa = NULL; 1131 1131 } 1132 1132 … … 1279 1279 return EOK; 1280 1280 error: 1281 free(sdcap );1282 free(scap );1283 free(smcap );1281 free(sdcapa); 1282 free(scapa); 1283 free(smcapa); 1284 1284 free(sfstype); 1285 1285 free(svcname);
Note:
See TracChangeset
for help on using the changeset viewer.