[BACK]Return to smartctl.cpp CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / smartmontools

Diff for /embedaddon/smartmontools/smartctl.cpp between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2013/07/22 01:17:36 version 1.1.1.4, 2013/10/14 07:54:04
Line 85  static void Usage() Line 85  static void Usage()
 "  --identify[=[w][nvb]]\n"  "  --identify[=[w][nvb]]\n"
 "         Show words and bits from IDENTIFY DEVICE data                (ATA)\n\n"  "         Show words and bits from IDENTIFY DEVICE data                (ATA)\n\n"
 "  -g NAME, --get=NAME\n"  "  -g NAME, --get=NAME\n"
"        Get device setting: all, aam, apm, lookahead, security, wcache, rcache\n\n""        Get device setting: all, aam, apm, lookahead, security, wcache, rcache, wcreorder\n\n"
 "  -a, --all\n"  "  -a, --all\n"
 "         Show all SMART information for device\n\n"  "         Show all SMART information for device\n\n"
 "  -x, --xall\n"  "  -x, --xall\n"
Line 121  static void Usage() Line 121  static void Usage()
 "  -s NAME[,VALUE], --set=NAME[,VALUE]\n"  "  -s NAME[,VALUE], --set=NAME[,VALUE]\n"
 "        Enable/disable/change device setting: aam,[N|off], apm,[N|off],\n"  "        Enable/disable/change device setting: aam,[N|off], apm,[N|off],\n"
 "        lookahead,[on|off], security-freeze, standby,[N|off|now],\n"  "        lookahead,[on|off], security-freeze, standby,[N|off|now],\n"
"        wcache,[on|off], rcache,[on|off]\n\n""        wcache,[on|off], rcache,[on|off], wcreorder,[on|off]\n\n"
   );    );
   printf(    printf(
 "======================================= READ AND DISPLAY DATA OPTIONS =====\n\n"  "======================================= READ AND DISPLAY DATA OPTIONS =====\n\n"
Line 218  static std::string getvalidarglist(int opt) Line 218  static std::string getvalidarglist(int opt)
   case 'f':    case 'f':
     return "old, brief, hex[,id|val]";      return "old, brief, hex[,id|val]";
   case 'g':    case 'g':
    return "aam, apm, lookahead, security, wcache, rcache";    return "aam, apm, lookahead, security, wcache, rcache, wcreorder";
   case opt_set:    case opt_set:
     return "aam,[N|off], apm,[N|off], lookahead,[on|off], security-freeze, "      return "aam,[N|off], apm,[N|off], lookahead,[on|off], security-freeze, "
           "standby,[N|off|now], wcache,[on|off], rcache,[on|off]";           "standby,[N|off|now], wcache,[on|off], rcache,[on|off], wcreorder,[on|off]";
   case 's':    case 's':
     return getvalidarglist(opt_smart)+", "+getvalidarglist(opt_set);      return getvalidarglist(opt_smart)+", "+getvalidarglist(opt_set);
   case opt_identify:    case opt_identify:
Line 626  static const char * parse_options(int argc, char** arg Line 626  static const char * parse_options(int argc, char** arg
       ataopts.smart_logdir = ataopts.gp_logdir = true;        ataopts.smart_logdir = ataopts.gp_logdir = true;
       ataopts.sct_temp_sts = ataopts.sct_temp_hist = true;        ataopts.sct_temp_sts = ataopts.sct_temp_hist = true;
       ataopts.sct_erc_get = true;        ataopts.sct_erc_get = true;
         ataopts.sct_wcache_reorder_get = true;
       ataopts.devstat_all_pages = true;        ataopts.devstat_all_pages = true;
       ataopts.sataphy = true;        ataopts.sataphy = true;
       ataopts.get_set_used = true;        ataopts.get_set_used = true;
Line 864  static const char * parse_options(int argc, char** arg Line 865  static const char * parse_options(int argc, char** arg
               ataopts.set_lookahead = -1;                ataopts.set_lookahead = -1;
             else if (on)              else if (on)
               ataopts.set_lookahead = 1;                ataopts.set_lookahead = 1;
               else
                 badarg = true;
             }
             else if (!strcmp(name, "wcreorder")) {
               if (get) {
                 ataopts.sct_wcache_reorder_get = true;
               }
               else if (off)
                 ataopts.sct_wcache_reorder_set = -1;
               else if (on)
                 ataopts.sct_wcache_reorder_set = 1;
             else              else
               badarg = true;                badarg = true;
           }            }
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>