Skip to content

Switch to STD::ifstream for reading password files #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eugenesan wants to merge 2 commits into
base: stable-1.5
Choose a base branch
from
Open

Switch to STD::ifstream for reading password files #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8acbb0a
Switch to STD::ifstream for reading password files
eugenesan Jun 25, 2022
5037eac
Add support for almost static build
eugenesan Oct 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,22 @@ if( NOT CMAKE_BUILD_TYPE )
set( CMAKE_BUILD_TYPE Release )
endif( NOT CMAKE_BUILD_TYPE )

set(STATIC_LINKING FALSE CACHE BOOL "Build a static binary?")
if ( STATIC_LINKING )
MESSAGE("ZBackup static binary")
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
else ( STATIC_LINKING )
MESSAGE("ZBackup dynamic binary")
endif ( STATIC_LINKING )

find_package( ZLIB REQUIRED )
include_directories( ${ZLIB_INCLUDE_DIRS} )

find_package( OpenSSL REQUIRED )
include_directories( ${OPENSSL_INCLUDE_DIR} )
if( STATIC_LINKING )
set ( OPENSSL_LIBRARIES "${OPENSSL_LIBRARIES}" -ldl )
endif(STATIC_LINKING)

find_package( Protobuf REQUIRED )
include_directories( ${PROTOBUF_INCLUDE_DIRS} )
Expand Down Expand Up @@ -64,6 +75,11 @@ if ( ZBACKUP_VERSION )
MESSAGE("ZBackup version ${ZBACKUP_VERSION}")
endif( ZBACKUP_VERSION )

if( STATIC_LINKING )
set( CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++" )
set ( LIBUNWIND_LIBRARIES )
endif(STATIC_LINKING)

set( sourceFiles
appendallocator.cc
backup_collector.cc
Expand Down Expand Up @@ -104,6 +120,7 @@ if ( WITH_BUSE )
buse.c
)
endif()

add_executable( zbackup ${sourceFiles} ${protoSrcs} ${protoHdrs} )
if ( WITH_BUSE )
target_compile_definitions( zbackup PRIVATE WITH_BUSE )
Expand All @@ -119,4 +136,8 @@ target_link_libraries( zbackup
${LIBUNWIND_LIBRARIES}
)

#if( STATIC_LINKING )
# set_target_properties( zbackup PROPERTIES LINK_SEARCH_END_STATIC 1 )
#endif(STATIC_LINKING)

install( TARGETS zbackup DESTINATION bin )
13 changes: 9 additions & 4 deletions zbackup.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Copyright (c) 2012-2014 Konstantin Isakov <ikm@zbackup.org> and ZBackup contributors, see CONTRIBUTORS
// Part of ZBackup. Licensed under GNU GPLv2 or later + OpenSSL, see LICENSE

#include <fstream>
#include <streambuf>

#include "zutils.hh"
#include "debug.hh"
#include "version.hh"
Expand Down Expand Up @@ -32,18 +35,20 @@ int main( int argc, char *argv[] )
{
// Read the password
char const * passwordFile = argv[ x + 1 ];
string passwordData;
if ( passwordFile )
{
File f( passwordFile, File::ReadOnly );
passwordData.resize( f.size() );
f.read( &passwordData[ 0 ], passwordData.size() );
// Read password from file/descriptor
std::ifstream passwordFileStream(passwordFile);
std::string passwordData((std::istreambuf_iterator<char>(passwordFileStream)),
std::istreambuf_iterator<char>());

// If the password ends with \n, remove that last \n. Many editors will
// add \n there even if a user doesn't want them to
if ( !passwordData.empty() &&
passwordData[ passwordData.size() - 1 ] == '\n' )
passwordData.resize( passwordData.size() - 1 );

// Store new password
passwords.push_back( passwordData );
}
++x;
Expand Down