Mercurial > hg > octave-lyh

comparison src/load-save.cc @ 5351:05adf9de7657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2005-05-16 20:07:36 by dbateman]
author dbateman
date Mon, 16 May 2005 20:07:36 +0000
parents 22994a5730f9
children 4bbde94b5cf8
comparison
equal deleted inserted replaced
5350:ad44a165950d 5351:05adf9de7657
1149 #ifdef HAVE_ZLIB 1149 #ifdef HAVE_ZLIB
1150 else if (argv[i] == "-zip" || argv[i] == "-z") 1150 else if (argv[i] == "-zip" || argv[i] == "-z")
1151 { 1151 {
1152 use_zlib = true; 1152 use_zlib = true;
1153 } 1153 }
1154 else if (argv[i] == "-nozip" || argv[i] == "-nz")
1155 {
1156 use_zlib = false;
1157 }
1158 #endif 1154 #endif
1159 else 1155 else
1160 break; 1156 break;
1161 } 1157 }
1162 1158
1513 are compressed with gzip outside of octave, and gzip can equally be used to\n\ 1509 are compressed with gzip outside of octave, and gzip can equally be used to\n\
1514 convert the files for backward compatibility." 1510 convert the files for backward compatibility."
1515 1511
1516 HAVE_ZLIB_HELP_STRING 1512 HAVE_ZLIB_HELP_STRING
1517 1513
1518 "@item -nozip\n\
1519 @itemx -nz\n\
1520 Disable the use of the file compression."
1521
1522 HAVE_ZLIB_HELP_STRING
1523
1524 "@end table\n\ 1514 "@end table\n\
1525 \n\ 1515 \n\
1526 The list of variables to save may include wildcard patterns containing\n\ 1516 The list of variables to save may include wildcard patterns containing\n\
1527 the following special characters:\n\ 1517 the following special characters:\n\
1528 @table @code\n\ 1518 @table @code\n\
1578 1568
1579 bool append = false; 1569 bool append = false;
1580 1570
1581 bool use_zlib = false; 1571 bool use_zlib = false;
1582 1572
1583 parse_save_options (Vdefault_save_options, format, append, save_as_floats, 1573 load_save_format user_file_format = LS_UNKNOWN;
1584 save_builtins, use_zlib, 0); 1574 bool dummy;
1585 1575
1576 // Get user file format
1577 parse_save_options (argv, argc, user_file_format, dummy,
1578 dummy, dummy, dummy, 1);
1579
1580 if (user_file_format == LS_UNKNOWN)
1581 parse_save_options (Vdefault_save_options, format, append, save_as_floats,
1582 save_builtins, use_zlib, 0);
1583
1586 int i = parse_save_options (argv, argc, format, append, save_as_floats, 1584 int i = parse_save_options (argv, argc, format, append, save_as_floats,
1587 save_builtins, use_zlib, 1); 1585 save_builtins, use_zlib, 1);
1588 1586
1589 if (error_state) 1587 if (error_state)
1590 return retval; 1588 return retval;
1591 1589
1592 if (i == argc) 1590 if (i == argc)