Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2:Test
dar
dar.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File dar.diff of Package dar
--- configure.ac +++ configure.ac @@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION +AM_GNU_GETTEXT_VERSION(0.14.3) AM_ICONV # Checks for programs. --- src/dar_suite/command_line.cpp +++ src/dar_suite/command_line.cpp @@ -828,7 +828,7 @@ throw Erange("get_args", tools_printf(gettext(MISSING_ARG), char(lu))); if(filename != "" || sauv_root != NULL) throw Erange("get_args", gettext(" Only one option of -c -d -t -l -C -x or -+ is allowed")); - if(optarg != "") + if(strlen(optarg)) tools_split_path_basename(optarg, sauv_root, filename); else throw Erange("get_args", tools_printf(gettext(INVALID_ARG), char(lu))); --- src/dar_suite/dar_cp.cpp +++ src/dar_suite/dar_cp.cpp @@ -50,6 +50,8 @@ #endif } +#include <cstring> +#include <cstdlib> #include <iostream> #include "dar_suite.hpp" @@ -92,7 +94,7 @@ ret = EXIT_OK; } else - if(argc != 3 || argv[1] == "-h") + if(argc != 3 || !strcmp(argv[1],"-h")) { show_usage(dialog, argv[0]); ret = EXIT_SYNTAX; --- src/dar_suite/dar_manager.cpp +++ src/dar_suite/dar_manager.cpp @@ -29,6 +29,7 @@ #include "getopt_decision.h" } // end extern "C" +#include <cstring> #include <vector> #include <string> #include "dar_suite.hpp" --- src/dar_suite/dar_suite.cpp +++ src/dar_suite/dar_suite.cpp @@ -45,6 +45,7 @@ } +#include <cstring> #include <iostream> #include <new> @@ -96,7 +97,7 @@ // gettext settings try { - if(DAR_LOCALEDIR != "") + if(strlen(DAR_LOCALEDIR)) if(bindtextdomain(PACKAGE, DAR_LOCALEDIR) == NULL) throw Erange("", "Cannot open the translated messages directory, native language support will not work"); if(setlocale(LC_MESSAGES, "") == NULL || setlocale(LC_CTYPE, "") == NULL) --- src/dar_suite/dar_xform.cpp +++ src/dar_suite/dar_xform.cpp @@ -33,6 +33,7 @@ #include "getopt_decision.h" } // end extern "C" +#include <cstring> #include <iostream> #include "sar.hpp" #include "sar_tools.hpp" @@ -356,7 +357,7 @@ dialog.warning(gettext("Too many argument on command line, see -h option for help")); return false; } - if(argv[optind] != "") + if(strlen(argv[optind])) { tools_split_path_basename(argv[optind], src_dir, src); tools_check_basename(dialog, *src_dir, src, EXTENSION); @@ -366,7 +367,7 @@ dialog.warning(gettext("Invalid argument as source archive")); return false; } - if(argv[optind+1] != "") + if(strlen(argv[optind+1])) tools_split_path_basename(argv[optind+1], dst_dir, dst); else { --- src/examples/factoriel.cpp +++ src/examples/factoriel.cpp @@ -48,6 +48,7 @@ #endif } // end extern "C" +#include <cstring> #include <string> #include <iostream> --- src/examples/prime.cpp +++ src/examples/prime.cpp @@ -25,6 +25,7 @@ #include "../my_config.h" #include <iostream> +#include <cstdlib> #include "infinint.hpp" #include "deci.hpp" --- src/libdar/database_header.cpp +++ src/libdar/database_header.cpp @@ -47,6 +47,7 @@ #endif } // end extern "C" +#include <cstring> #include "database_header.hpp" #include "compressor.hpp" #include "tools.hpp" --- src/libdar/erreurs.cpp +++ src/libdar/erreurs.cpp @@ -25,6 +25,7 @@ #include "../my_config.h" #include <iostream> +#include <cstdlib> #include "erreurs.hpp" #include "infinint.hpp" #include "deci.hpp" --- src/libdar/header_version.cpp +++ src/libdar/header_version.cpp @@ -25,6 +25,7 @@ #include "../my_config.h" +#include <cstring> #include "header_version.hpp" #include "integers.hpp" --- src/libdar/libdar.cpp +++ src/libdar/libdar.cpp @@ -55,6 +55,7 @@ #endif #include <list> +#include <string.h> using namespace std; @@ -525,7 +526,7 @@ thread_safe_initialized = true; thread_cancellation::init(); #endif - if(DAR_LOCALEDIR != "") + if(strlen(DAR_LOCALEDIR)) if(bindtextdomain(PACKAGE, DAR_LOCALEDIR) == NULL) throw Erange("", "Cannot open the translated messages directory, native language support will not work"); #ifdef __DYNAMIC__ --- src/libdar/mask.cpp +++ src/libdar/mask.cpp @@ -31,6 +31,7 @@ #endif } // end extern "C" +#include <cstring> #include "mask.hpp" #include "tools.hpp" #include "erreurs.hpp" --- src/libdar/mask_list.cpp +++ src/libdar/mask_list.cpp @@ -23,6 +23,7 @@ /*********************************************************************/ #include "../my_config.h" +#include <cstring> extern "C" { --- src/libdar/special_alloc.cpp +++ src/libdar/special_alloc.cpp @@ -28,6 +28,7 @@ #include "user_interaction.hpp" #include "tools.hpp" +#include <cstring> #include <list> #include <iostream> #include <errno.h> --- src/libdar/statistics.cpp +++ src/libdar/statistics.cpp @@ -33,6 +33,7 @@ } #include <string> +#include <cstring> #include "statistics.hpp" --- src/libdar/storage.cpp +++ src/libdar/storage.cpp @@ -23,6 +23,7 @@ /*********************************************************************/ #include "../my_config.h" +#include <cstring> #include "storage.hpp" #include "infinint.hpp" #include "generic_file.hpp" --- src/libdar/storage.hpp +++ src/libdar/storage.hpp @@ -215,6 +215,7 @@ { E_BEGIN; if(cell != NULL) + { if(offset > 0) --offset; else @@ -225,6 +226,7 @@ else offset = OFF_BEGIN; } + } E_END("storage::iterator::slik_plus_one", ""); } --- src/libdar/string_file.cpp +++ src/libdar/string_file.cpp @@ -26,6 +26,7 @@ #include "../my_config.h" #include "string_file.hpp" +#include <cstring> using namespace std; --- src/libdar/thread_cancellation.cpp +++ src/libdar/thread_cancellation.cpp @@ -23,6 +23,7 @@ /*********************************************************************/ #include "../my_config.h" +#include <cstring> extern "C" { --- src/libdar/tools.cpp +++ src/libdar/tools.cpp @@ -41,6 +41,8 @@ # endif #endif +#include <cstdlib> + #if HAVE_SYS_TYPES_H #include <sys/types.h> #endif --- src/libdar/tronconneuse.cpp +++ src/libdar/tronconneuse.cpp @@ -24,6 +24,7 @@ #include "../my_config.h" +#include <cstring> #include "tronconneuse.hpp" #include "tools.hpp" --- src/libdar/user_group_bases.cpp +++ src/libdar/user_group_bases.cpp @@ -45,6 +45,7 @@ #endif } +#include <cstring> #include "erreurs.hpp" #include "user_group_bases.hpp" #include "tools.hpp" --- src/testing/Makefile.am +++ src/testing/Makefile.am @@ -14,7 +14,7 @@ endif noinst_PROGRAMS = test_hide_file test_terminateur test_catalogue test_infinint test_tronc test_compressor test_mask test_tuyau test_deci test_path test_erreurs test_sar test_filesystem test_scrambler test_generic_file test_storage test_special_alloc test_limitint test_libdar test_cache test_tronconneuse test_elastic test_blowfish test_mask_list test_string_file -AM_LDFLAGS = -all-static @LTLIBINTL@ +AM_LDFLAGS = @LTLIBINTL@ LDADD = -L../libdar -l$(MYLIB) noinst_HEADERS = testtools.hpp --- src/testing/Makefile.in +++ src/testing/Makefile.in @@ -332,7 +332,7 @@ @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@AM_CPPFLAGS = -I../libdar -I../dar_suite -DDAR_LOCALEDIR=\"$(localedir)\" @BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@AM_CPPFLAGS = -DLIBDAR_MODE=64 -I../libdar -I../dar_suite -DDAR_LOCALEDIR=\"$(localedir)\" @BUILD_MODE32_TRUE@AM_CPPFLAGS = -DLIBDAR_MODE=32 -I../libdar -I../dar_suite -DDAR_LOCALEDIR=\"$(localedir)\" -AM_LDFLAGS = -all-static @LTLIBINTL@ +AM_LDFLAGS = @LTLIBINTL@ LDADD = -L../libdar -l$(MYLIB) noinst_HEADERS = testtools.hpp test_hide_file_SOURCES = test_hide_file.cpp ../dar_suite/no_comment.cpp ../dar_suite/hide_file.cpp ../dar_suite/config_file.cpp ../dar_suite/shell_interaction.cpp --- src/testing/test_blowfish.cpp +++ src/testing/test_blowfish.cpp @@ -40,6 +40,7 @@ #endif } +#include <cstring> #include <iostream> #include "libdar.hpp" --- src/testing/test_generic_file.cpp +++ src/testing/test_generic_file.cpp @@ -71,7 +71,7 @@ } fichier f1 = fichier(*ui, argv[1], gf_read_only); - S_I fd = ::open(argv[2], O_WRONLY|O_CREAT|O_TRUNC|O_BINARY); + S_I fd = ::open(argv[2], O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, 0600); if(fd < 0) { cout << "cannot open "<< argv[2] << endl; --- src/testing/test_libdar.cpp +++ src/testing/test_libdar.cpp @@ -89,7 +89,7 @@ void warning(const string &x, void *context) { - printf("[%d]%s\n", (U_I)context, x.c_str()); + printf("[%d]%s\n", (unsigned long)context, x.c_str()); } bool question(const string & x, void *context) @@ -97,7 +97,7 @@ bool rep = false; char r; - printf("[%d]%s\n", (U_I)context, x.c_str()); + printf("[%d]%s\n", (unsigned long)context, x.c_str()); scanf("%c", &r); rep = r == 'y'; @@ -120,7 +120,7 @@ bool has_children, void *context) { - ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (U_I)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children"); + ui.printf("[[%d]][%S][%S][%S][%S][%S][%S][%S][%s][%s]\n", (long)context, &flag, &perm, &uid, &gid, &size, &date, &filename, is_dir ? "dir" : "not_dir", has_children ? "has children" : "no children"); } void f2() --- src/testing/test_tronc.cpp +++ src/testing/test_tronc.cpp @@ -44,6 +44,7 @@ } // end extern "C" #include <iostream> +#include <cstring> #include "libdar.hpp" #include "tronc.hpp"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
