Attachment #169996 for bug #244617

View | Details | Raw Unified | Return to bug 244617
Collapse All | Expand All





                          Partition Image LZO-PATCH              
                             -------------------                                         
    copyright            : (C) 2008 by Max Bidlingmaier
               
AUTHOR: Max Bidlingmaier
Contact: mbidlingmaier at esigma dash technology dot com
                       
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by 
the Free Software Foundation; either version 2 of the License, or
at your option) any later version.

This Patch enables LZO-compression for Partition Image. LZO is about 3-4 times faster
than gzip at the cost of some compression ration (http://www.oberhumer.com/opensource/lzo/)

To use LZO-compression apply the patch and use configure with --enable-lzo, additional tags are
--with-lzo-headers and --with-lzo-lib if configure is unable to find headers and libs

This Patch is against Partimage 0.6.7

Lines 148-153 Link Here

(-)partimage-0.6.7/config.h.in (+5 lines)
148	/* Define to 1 if you have the <unistd.h> header file. */	148	/* Define to 1 if you have the <unistd.h> header file. */
149	#undef HAVE_UNISTD_H	149	#undef HAVE_UNISTD_H
150		150
		151	/* { { echo "$as_me:$LINENO: error: Define to 1 if LZO is enabled" >&5 echo
		152	"$as_me: error: Define to 1 if LZO is enabled" >&2;} { (exit 1); exit 1; };
		153	} */
		154	#undef LZO_ENABLED
		155
151	/* Define to 1 if you want partimaged to drop privilieges on start */	156	/* Define to 1 if you want partimaged to drop privilieges on start */
152	#undef MUST_CHEUID	157	#undef MUST_CHEUID
153		158




#! /bin/sh
# From configure.ac Revision: 1.4 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for partimage 0.6.7-lzo.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

# Identity of this package.
PACKAGE_NAME='partimage'
PACKAGE_TARNAME='partimage'
PACKAGE_VERSION='0.6.7-lzo'
PACKAGE_STRING='partimage 0.6.7-lzo'
PACKAGE_BUGREPORT=''

# Factoring default headers for most tests.

  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
\`configure' configures partimage 0.6.7-lzo to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...



if test -n "$ac_init_help"; then
  case $ac_init_help in
     short | recursive ) echo "Configuration of partimage 0.6.7-lzo:";;
   esac
  cat <<\_ACEOF


  --disable-largefile     omit support for large files
--enable-efence Enable linking with libefence Memory Debugger
--disable-ssl       Don't compile ssl mode
--enable-lzo         Enable LZO-Compression
--enable-devel Enable developpers options (debug, ...)
--enable-pam Enable PAM to authenticate users
--enable-all-static     build static binaries

  --with-tags[=TAGS]      include additional configurations [automatic]
--with-ssl-headers=DIR  SSL Include files location
--with-ssl-lib=DIR  SSL Library location
--with-lzo-headers=DIR  LZO Include files location
--with-lzo-lib=DIR  LZO Library location
--with-slang-headers=DIR  SLang Include files location
  --with-log-dir=PATH     logfiles /var/log
  --with-debug-level=X    default debut level used to write the debug logfile 1

test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
  cat <<\_ACEOF
partimage configure 0.6.7-lzo
generated by GNU Autoconf 2.61

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by partimage $as_me 0.6.7-lzo, which was
generated by GNU Autoconf 2.61.  Invocation command line was

  $ $0 $@


# Define the identity of the package.
 PACKAGE='partimage'
 VERSION='0.6.7-lzo'


cat >>confdefs.h <<_ACEOF

  ;;
*-*-irix6*)
  # Find out which ABI we are using.
  echo '#line 6278 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:9076: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
   echo "$as_me:9080: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:9366: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
   echo "$as_me:9370: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:9470: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
   echo "$as_me:9474: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized

  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
#line 11832 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H

  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
#line 11932 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:14352: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
   echo "$as_me:14356: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:14456: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
   echo "$as_me:14460: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:16031: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
   echo "$as_me:16035: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:16135: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
   echo "$as_me:16139: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:18335: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
   echo "$as_me:18339: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:18625: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
   echo "$as_me:18629: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.

   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
   (eval echo "\"\$as_me:18729: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
   echo "$as_me:18733: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized

fi


#lzo enabled
# Check whether --enable-lzo was given.
if test "${enable_lzo+set}" = set; then
  enableval=$enable_lzo; LZO=$enableval
else
  LZO=no

fi



# Check whether --with-lzo-headers was given.
if test "${with_lzo_headers+set}" = set; then
  withval=$with_lzo_headers; LZO_HDR_DIR="$withval"
    CPPFLAGS="$CPPFLAGS -I$withval"

fi



# Check whether --with-lzo-lib was given.
if test "${with_lzo_lib+set}" = set; then
  withval=$with_lzo_lib; LIBS="$LIBS -L$withval"

fi



# Check whether --with-slang-headers was given.
if test "${with_slang_headers+set}" = set; then


fi

if test "$LZO" = "yes"; then

  { echo "$as_me:$LINENO: result: " >&5
echo "${ECHO_T}" >&6; }
  { echo "$as_me:$LINENO: checking  for LZO Library Header files ... ..." >&5
echo "$as_me: checking  for LZO Library Header files ... ..." >&6;}

    { echo "$as_me:$LINENO: checking \"for lzo1x.h lzoconf.h\"" >&5
echo $ECHO_N "checking \"for lzo1x.h lzoconf.h\"... $ECHO_C" >&6; }
    ac_hdr_found=no
    for p in $LZO_HDR_DIR /usr/include /usr/include/lzo; do

    ac_file_found=yes
    for f in lzo1x.h lzoconf.h; do
	if test ! -f $p/$f; then
    	   ac_file_found=no
	   break;
	fi
    done

    if test "$ac_file_found" = "yes" ; then

     	       ac_hdr_found=yes
	       break


    else
	:
    fi

    done
    if test "$ac_hdr_found" = "yes" ; then
 	CPPFLAGS="$CPPFLAGS -I$p"
        { echo "$as_me:$LINENO: result: ($p) yes " >&5
echo "${ECHO_T}($p) yes " >&6; }
	 { echo "$as_me:$LINENO: checking for lzo1x_1_compress in -llzo" >&5
echo $ECHO_N "checking for lzo1x_1_compress in -llzo... $ECHO_C" >&6; }
if test "${ac_cv_lib_lzo_lzo1x_1_compress+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_check_lib_save_LIBS=$LIBS
LIBS="-llzo  $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */

/* Override any GCC internal prototype to avoid an error.
   Use char because int might match the return type of a GCC
   builtin and then its argument prototype would still apply.  */
#ifdef __cplusplus
extern "C"
#endif
char lzo1x_1_compress ();
int
main ()
{
return lzo1x_1_compress ();
  ;
  return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  (eval "$ac_link") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
	 test -z "$ac_c_werror_flag" ||
	 test ! -s conftest.err
       } && test -s conftest$ac_exeext &&
       $as_test_x conftest$ac_exeext; then
  ac_cv_lib_lzo_lzo1x_1_compress=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

	ac_cv_lib_lzo_lzo1x_1_compress=no
fi

rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
      conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_lzo_lzo1x_1_compress" >&5
echo "${ECHO_T}$ac_cv_lib_lzo_lzo1x_1_compress" >&6; }
if test $ac_cv_lib_lzo_lzo1x_1_compress = yes; then
  LIBS="$LIBS -llzo"
else
  { { echo "$as_me:$LINENO: error:  Required for LZO Compression Library not found. " >&5
echo "$as_me: error:  Required for LZO Compression Library not found. " >&2;}
   { (exit 1); exit 1; }; }

fi


    else
        { echo "$as_me:$LINENO: result: \"no\"" >&5
echo "${ECHO_T}\"no\"" >&6; }
	{ { echo "$as_me:$LINENO: error:  LZO Headers not found. " >&5
echo "$as_me: error:  LZO Headers not found. " >&2;}
   { (exit 1); exit 1; }; }

    fi


cat >>confdefs.h <<\_ACEOF
#define LZO_ENABLED 1
_ACEOF

fi

# Check whether --enable-login was given.
if test "${enable_login+set}" = set; then
  enableval=$enable_login;

# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by partimage $as_me 0.6.7-lzo, which was
generated by GNU Autoconf 2.61.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES

_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
partimage config.status 0.6.7-lzo
configured by $0, generated by GNU Autoconf 2.61,
  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"






AC_PREREQ(2.59c)

AC_INIT([partimage], [0.6.7-lzo])

AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([m4])

  LIBS="$LIBS -L$withval"
)

#lzo enabled
AC_ARG_ENABLE(lzo,
    [--enable-lzo         Enable LZO-Compression],
    LZO=$enableval,
    LZO=no
)

AC_ARG_WITH(lzo-headers,
    [--with-lzo-headers=DIR  LZO Include files location],
    LZO_HDR_DIR="$withval"
    CPPFLAGS="$CPPFLAGS -I$withval"
)

AC_ARG_WITH(lzo-lib,
    [--with-lzo-lib=DIR  LZO Library location],
    LIBS="$LIBS -L$withval"
)

dnl SLang location
AC_ARG_WITH(slang-headers,
    [--with-slang-headers=DIR  SLang Include files location],

  )
fi

if test "$LZO" = "yes"; then

  AC_MSG_RESULT()
  AC_CHECKING([ for LZO Library Header files ... ])
  AC_SEARCH_HEADERS(lzo1x.h lzoconf.h, $LZO_HDR_DIR /usr/include /usr/include/lzo,
    [ AC_CHECK_LIB(lzo, lzo1x_1_compress, [LIBS="$LIBS -llzo"],
        AC_MSG_ERROR([ Required for LZO Compression Library not found. ])
      )
    ],
    AC_MSG_ERROR([ LZO Headers not found. ])
  )
  AC_DEFINE([LZO_ENABLED], 1,
    AC_MSG_ERROR([Define to 1 if LZO is enabled]))
fi

dnl Client must login.
dnl Don't remove the comma, it's required.
AC_ARG_ENABLE(login,

Lines 332-337 int CSaveOptWindow::create(char *szImage Link Here

(-)partimage-0.6.7/src/client/gui_text.cpp (-1 / +12 lines)
332	m_radioCompNone = newtRadiobutton(1, 2, i18n("None (very fast + very big file)"), options.dwCompression == COMPRESS_NONE, NULL);	332	m_radioCompNone = newtRadiobutton(1, 2, i18n("None (very fast + very big file)"), options.dwCompression == COMPRESS_NONE, NULL);
333	m_radioCompGzip = newtRadiobutton(1, 3, "Gzip (.gz: medium speed + small image file)", options.dwCompression == COMPRESS_GZIP, m_radioCompNone);	333	m_radioCompGzip = newtRadiobutton(1, 3, "Gzip (.gz: medium speed + small image file)", options.dwCompression == COMPRESS_GZIP, m_radioCompNone);
334	m_radioCompBzip2 = newtRadiobutton(1, 4, "Bzip2 (.bz2: very slow + very small image file)", options.dwCompression == COMPRESS_BZIP2, m_radioCompGzip);	334	m_radioCompBzip2 = newtRadiobutton(1, 4, "Bzip2 (.bz2: very slow + very small image file)", options.dwCompression == COMPRESS_BZIP2, m_radioCompGzip);
		335	#ifdef LZO_ENABLED
		336	m_radioCompLzo = newtRadiobutton(1, 5, "LZO (.lzo: fast + not to small)", options.dwCompression == COMPRESS_LZO, m_radioCompBzip2);
		337	#endif
335		338
336	m_labelOptions = newtLabel(1, 7, i18n("Options"));	339	m_labelOptions = newtLabel(1, 7, i18n("Options"));
337	m_checkCheckBeforeSaving = newtCheckbox(1, 8, i18n("Check partition before saving"), (!!options.bCheckBeforeSaving ? 'X' : ' '), " X", NULL);	340	m_checkCheckBeforeSaving = newtCheckbox(1, 8, i18n("Check partition before saving"), (!!options.bCheckBeforeSaving ? 'X' : ' '), " X", NULL);
Lines 357-363 int CSaveOptWindow::create(char *szImage Link Here
357		360
358	m_formMain = newtForm(NULL, NULL, 0);	361	m_formMain = newtForm(NULL, NULL, 0);
359	newtFormAddComponents(m_formMain, m_labelCompression, m_labelOptions, m_labelSplit, NULL);	362	newtFormAddComponents(m_formMain, m_labelCompression, m_labelOptions, m_labelSplit, NULL);
360	newtFormAddComponents(m_formMain, m_radioCompNone, m_radioCompGzip, m_radioCompBzip2, m_checkCheckBeforeSaving, m_checkAskDesc, m_checkOverwrite, NULL);	363	newtFormAddComponents(m_formMain, m_radioCompNone, m_radioCompGzip, m_radioCompBzip2, m_radioCompLzo, m_checkCheckBeforeSaving, m_checkAskDesc, m_checkOverwrite, NULL);
361	newtFormAddComponents(m_formMain, m_labelFinish, m_radioFinishWait, m_radioFinishHalt, m_radioFinishReboot, m_radioFinishQuit, m_radioFinishLast, NULL);	364	newtFormAddComponents(m_formMain, m_labelFinish, m_radioFinishWait, m_radioFinishHalt, m_radioFinishReboot, m_radioFinishQuit, m_radioFinishLast, NULL);
362	newtFormAddComponents(m_formMain, m_radioSplitAuto, m_radioSplitSize, m_labelSplitSizeKB, m_editSplitSize, m_checkSplitWait, NULL);	365	newtFormAddComponents(m_formMain, m_radioSplitAuto, m_radioSplitSize, m_labelSplitSizeKB, m_editSplitSize, m_checkSplitWait, NULL);
363	addHotKeys();	366	addHotKeys();
Lines 384-389 int CSaveOptWindow::getValues(COptions * Link Here
384	options->dwCompression = COMPRESS_GZIP;	387	options->dwCompression = COMPRESS_GZIP;
385	else if (newtRadioGetCurrent(m_radioCompNone) == m_radioCompBzip2)	388	else if (newtRadioGetCurrent(m_radioCompNone) == m_radioCompBzip2)
386	options->dwCompression = COMPRESS_BZIP2;	389	options->dwCompression = COMPRESS_BZIP2;
		390	#ifdef LZO_ENABLED
		391	else if (newtRadioGetCurrent(m_radioCompNone) == m_radioCompLzo)
		392	options->dwCompression = COMPRESS_LZO;
		393	#endif
387		394
388	// get finish level	395	// get finish level
389	if (newtRadioGetCurrent(m_radioFinishWait) == m_radioFinishWait)	396	if (newtRadioGetCurrent(m_radioFinishWait) == m_radioFinishWait)
Lines 485-493 int CSavingWindow::create(const char *sz Link Here
485	case COMPRESS_BZIP2:	492	case COMPRESS_BZIP2:
486	SNPRINTF(szTemp, i18n("Compression level:...........bzip2"));	493	SNPRINTF(szTemp, i18n("Compression level:...........bzip2"));
487	break;	494	break;
		495	#ifdef LZO_ENABLED
488	case COMPRESS_LZO:	496	case COMPRESS_LZO:
489	SNPRINTF(szTemp, i18n("Compression level:...........lzo"));	497	SNPRINTF(szTemp, i18n("Compression level:...........lzo"));
490	break;	498	break;
		499	#endif
491	}	500	}
492	m_labelCompression = newtLabel(1, 6, szTemp);	501	m_labelCompression = newtLabel(1, 6, szTemp);
493		502
Lines 898-907 void CRestoringWindow::showImageFileInfo Link Here
898	SNPRINTF(szTemp, i18n("Compression level:................bzip2"));	907	SNPRINTF(szTemp, i18n("Compression level:................bzip2"));
899	SNPRINTF(szTemp2, i18n("bzip2"));	908	SNPRINTF(szTemp2, i18n("bzip2"));
900	break;	909	break;
		910	#ifdef LZO_ENABLED
901	case COMPRESS_LZO:	911	case COMPRESS_LZO:
902	SNPRINTF(szTemp, i18n("Compression level:................lzo"));	912	SNPRINTF(szTemp, i18n("Compression level:................lzo"));
903	SNPRINTF(szTemp2, i18n("lzo"));	913	SNPRINTF(szTemp2, i18n("lzo"));
904	break;	914	break;
		915	#endif
905	default:	916	default:
906	memset(szTemp2, 0, sizeof(szTemp2));	917	memset(szTemp2, 0, sizeof(szTemp2));
907	SNPRINTF(szTemp3, i18n("Compression level:................%s"),szTemp2);	918	SNPRINTF(szTemp3, i18n("Compression level:................%s"),szTemp2);

Lines 77-83 class CSaveOptWindow: public COptionsWin Link Here

(-)partimage-0.6.7/src/client/gui_text.h (-1 / +1 lines)
77	private:	77	private:
78	//newtComponent m_formMain;	78	//newtComponent m_formMain;
79	newtComponent m_labelCompression, m_labelOptions, m_labelSplit;	79	newtComponent m_labelCompression, m_labelOptions, m_labelSplit;
80	newtComponent m_radioCompNone, m_radioCompLzop, m_radioCompGzip, m_radioCompBzip2;	80	newtComponent m_radioCompNone, m_radioCompLzop, m_radioCompGzip, m_radioCompBzip2, m_radioCompLzo;
81	newtComponent m_radioSplitSize, m_labelSplitSizeKB, m_radioSplitAuto;	81	newtComponent m_radioSplitSize, m_labelSplitSizeKB, m_radioSplitAuto;
82	newtComponent m_checkCheckBeforeSaving, m_checkAskDesc, m_checkOverwrite;	82	newtComponent m_checkCheckBeforeSaving, m_checkAskDesc, m_checkOverwrite;
83	newtComponent m_editSplitSize, m_checkSplitWait;	83	newtComponent m_editSplitSize, m_checkSplitWait;

Lines 43-48 Link Here

(-)partimage-0.6.7/src/client/imagefile.cpp (-1 / +256 lines)
43		43
44	#include <zlib.h> // gzip compression	44	#include <zlib.h> // gzip compression
45	#include <bzlib.h> // bzip2 compression	45	#include <bzlib.h> // bzip2 compression
		46	#ifdef LZO_ENABLED
		47	#include <lzo1x.h> // lzo compression
		48	#include <lzoutil.h>
		49	#endif
46		50
47	CParam g_param;	51	CParam g_param;
48		52
Lines 129-134 CImage::CImage(COptions * options) Link Here
129	m_fImageFile = NULL;	133	m_fImageFile = NULL;
130	m_gzImageFile = NULL;	134	m_gzImageFile = NULL;
131	m_bzImageFile = NULL;	135	m_bzImageFile = NULL;
		136	m_lzoImageFile = NULL;
132		137
133	RETURN;	138	RETURN;
134	}	139	}
Lines 274-279 void CImage::writeSplit() Link Here
274		279
275	RETURN;	280	RETURN;
276	}	281	}
		282	#ifdef LZO_ENABLED
		283	lzo_uint CImage::xread(FILE *f, lzo_voidp buf, lzo_uint len, lzo_bool allow_eof)
		284	{
		285	lzo_uint l;
		286
		287	l = lzo_fread(f,buf,len);
		288	if (l > len)
		289	{
		290	fprintf(stderr,"\nsomething's wrong with your C library !!!\n");
		291	exit(1);
		292	}
		293	if (l != len && !allow_eof)
		294	{
		295	fprintf(stderr,"\nread error - premature end of file\n");
		296	exit(1);
		297	}
		298	return l;
		299	}
		300
		301	lzo_uint CImage::xwrite(FILE *f, const lzo_voidp buf, lzo_uint len)
		302	{
		303	if (f != NULL && lzo_fwrite(f,buf,len) != len)
		304	{
		305	fprintf(stderr,"\nwrite error (disk full ?)\n");
		306	exit(1);
		307	}
		308	return len;
		309	}
		310
		311
		312	int CImage::xgetc(FILE *f)
		313	{
		314	unsigned char c;
		315	xread(f,(lzo_bytep) &c,1,0);
		316	return c;
		317	}
		318
		319	void CImage::xputc(FILE *f, int c)
		320	{
		321	unsigned char cc = (unsigned char) c;
		322	xwrite(f,(lzo_bytep) &cc,1);
		323	}
		324
		325	/* read and write portable 32-bit integers */
		326
		327	lzo_uint32 CImage::xread32(FILE *f)
		328	{
		329	unsigned char b[4];
		330	lzo_uint32 v;
		331
		332	xread(f,b,4,0);
		333	v = (lzo_uint32) b[3] << 0;
		334	v \|= (lzo_uint32) b[2] << 8;
		335	v \|= (lzo_uint32) b[1] << 16;
		336	v \|= (lzo_uint32) b[0] << 24;
		337	return v;
		338	}
		339
		340	void CImage::xwrite32(FILE *f, lzo_uint32 v)
		341	{
		342	unsigned char b[4];
		343
		344	b[3] = (unsigned char) (v >> 0);
		345	b[2] = (unsigned char) (v >> 8);
346	b[1] = (unsigned char) (v >> 16);
347	b[0] = (unsigned char) (v >> 24);
348	xwrite(f,b,4);
349	}
350	#endif
277		351
278	// =======================================================	352	// =======================================================
279	void CImage::write(void *vBuf, DWORD dwLength, bool bUpdateCRC)	353	void CImage::write(void *vBuf, DWORD dwLength, bool bUpdateCRC)
Lines 283-288 void CImage::write(void *vBuf, DWORD dwL Link Here
283	QWORD qwFreeSpace; //, qwCurrentSize;	357	QWORD qwFreeSpace; //, qwCurrentSize;
284	char *cBuf;	358	char *cBuf;
285	DWORD dwRes;	359	DWORD dwRes;
		360	DWORD outLen;
		361	#ifdef LZO_ENABLED
		362	lzo_byte *outBuf;
		363	lzo_byte *cLzoBuffer;
		364	#endif
		365	int nRes;
286		366
287	BEGIN;	367	BEGIN;
288		368
Lines 341-346 void CImage::write(void *vBuf, DWORD dwL Link Here
341	dwRes = (DWORD) gzwrite(m_gzImageFile, cBuf, dwLength);	421	dwRes = (DWORD) gzwrite(m_gzImageFile, cBuf, dwLength);
342	else if (m_options.dwCompression == COMPRESS_BZIP2)	422	else if (m_options.dwCompression == COMPRESS_BZIP2)
343	dwRes = (DWORD) BZ2_bzwrite(m_bzImageFile, cBuf, dwLength);	423	dwRes = (DWORD) BZ2_bzwrite(m_bzImageFile, cBuf, dwLength);
		424	#ifdef LZO_ENABLED
		425	else if (m_options.dwCompression == COMPRESS_LZO)
		426	{
		427	outBuf = (lzo_bytep) lzo_malloc(dwLength + dwLength / 64 + 16 + 3);
		428	cLzoBuffer = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);
		429	checksum = lzo_adler32(checksum, (BYTE*)cBuf, dwLength);
		430
		431	nRes = lzo1x_1_compress((BYTE*)cBuf, dwLength, outBuf, &outLen, cLzoBuffer);
		432	if (nRes != LZO_E_OK)
		433	showDebug(1, "ERROR: Compress LZO failed");
		434	else
		435	dwRes = dwLength;
		436	//write uncompressed blocksize
		437	xwrite32(m_lzoImageFile, dwLength);
		438	if (outLen < dwLength)
		439	{
		440	//write compressed block
		441	xwrite32(m_lzoImageFile, outLen); //blocklength
		442	xwrite(m_lzoImageFile, outBuf, outLen); //write block
		443	}
		444	else
		445	{
		446	//uncompressible, write original block
		447	xwrite32(m_lzoImageFile, dwLength); //blocklength
		448	xwrite(m_lzoImageFile, (BYTE*)cBuf, dwLength); //write block
		449	}
		450	lzo_free(outBuf);
		451	lzo_free(cLzoBuffer);
		452	}
		453	#endif
344	else	454	else
345	THROW(ERR_COMP);	455	THROW(ERR_COMP);
346		456
Lines 381-386 void CImage::read(char *cBuf, DWORD dwLe Link Here
381	static QWORD qwCount = 0LL;	491	static QWORD qwCount = 0LL;
382	DWORD dwRes;	492	DWORD dwRes;
383	int nRes;	493	int nRes;
		494	#ifdef LZO_ENABLED
		495	int lzoErr;
		496	DWORD unClen;
		497	lzo_byte *outBuf;
		498	#endif
		499
		500	DWORD outLen;
384		501
385	if (dwLength != 1) // avoid having BUFFER_BLOCK_SIZE messages with imginfo and restmbr	502	if (dwLength != 1) // avoid having BUFFER_BLOCK_SIZE messages with imginfo and restmbr
386	showDebug(4, "begin of ci::read: size=%lu, pos=%lld\n", dwLength, qwTotalBytes);	503	showDebug(4, "begin of ci::read: size=%lu, pos=%lld\n", dwLength, qwTotalBytes);
Lines 391-396 void CImage::read(char *cBuf, DWORD dwLe Link Here
391	nRes = gzread(m_gzImageFile, cBuf, dwLength);	508	nRes = gzread(m_gzImageFile, cBuf, dwLength);
392	else if (m_options.dwCompression == COMPRESS_BZIP2)	509	else if (m_options.dwCompression == COMPRESS_BZIP2)
393	nRes = BZ2_bzread(m_bzImageFile, cBuf, dwLength);	510	nRes = BZ2_bzread(m_bzImageFile, cBuf, dwLength);
		511	#ifdef LZO_ENABLED
		512	else if (m_options.dwCompression == COMPRESS_LZO)
		513	{
		514	lzo_uint unCSize;
		515	lzo_uint coCSize;
		516	unCSize = xread32(m_lzoImageFile); // read uncompressed size
		517	if (unCSize == 0){
		518	showDebug(3, "GOT LZO END OF FILE MARK");
		519	nRes = 0;
		520	g_nThreadState = THREAD_EOF;
		521	}
		522	else
		523	{
		524	coCSize = xread32(m_lzoImageFile); //read compressed size
		525	outBuf = (lzo_bytep) lzo_malloc(coCSize + 16);
		526	xread(m_lzoImageFile, outBuf, coCSize, 0); // read block
		527	if (coCSize < unCSize) //block has been compressed
		528	{
		529	lzo_uint new_len = unCSize;
		530	lzoErr = lzo1x_decompress(outBuf, nRes, (BYTE*)cBuf, &unClen, NULL);
		531	if (lzoErr != LZO_E_OK)
		532	showDebug(3, "ERROR with demcompression %d", lzoErr);
		533	checksum = lzo_adler32(checksum,(BYTE*)cBuf,unClen);
		534	}
		535	else
		536	{ //block has been incompressible
		537	memcpy((BYTE*)cBuf, outBuf, unCSize);
		538	unClen = unCSize;
		539	checksum = lzo_adler32(checksum,(BYTE*)cBuf,unClen);
		540	}
		541
		542	nRes = unClen;
		543	lzo_free(outBuf);
		544	}
		545	}
		546	#endif
394	else	547	else
395	THROW(ERR_COMP);	548	THROW(ERR_COMP);
396		549
Lines 423-429 void CImage::read(char *cBuf, DWORD dwLe Link Here
423	read(cBuf+dwFirstRead, dwLength-dwFirstRead, bUpdateCRC);	576	read(cBuf+dwFirstRead, dwLength-dwFirstRead, bUpdateCRC);
424	m_guiRestore -> showImageFileInfo(get_szImageFilename(), m_options.dwCompression, m_options.szFullyBatchMode);	577	m_guiRestore -> showImageFileInfo(get_szImageFilename(), m_options.dwCompression, m_options.szFullyBatchMode);
425	}	578	}
426	else if ((g_nThreadState == THREAD_ASKEXIT) \|\| (g_nThreadState == THREAD_FINISHED) )	579	else if ((g_nThreadState == THREAD_ASKEXIT) \|\| (g_nThreadState == THREAD_FINISHED))
427	{	580	{
428	showDebug(1, "READ ERROR 2: dwLength=%lu and dwRes=%lu and g_nThreadState=%d\n", dwLength, dwRes, g_nThreadState);	581	showDebug(1, "READ ERROR 2: dwLength=%lu and dwRes=%lu and g_nThreadState=%d\n", dwLength, dwRes, g_nThreadState);
429	}	582	}
Lines 573-578 void CImage::closeReading(bool bForceExi Link Here
573	}	726	}
574	else if (m_options.dwCompression == COMPRESS_BZIP2) // Bzip2 compression	727	else if (m_options.dwCompression == COMPRESS_BZIP2) // Bzip2 compression
575	BZ2_bzclose(m_bzImageFile);	728	BZ2_bzclose(m_bzImageFile);
		729	#ifdef LZO_ENABLED
		730	else if (m_options.dwCompression == COMPRESS_LZO) // LZO compression
		731	{
		732	lzo_uint32 cSumInFile;
		733	cSumInFile = xread32(m_lzoImageFile); //read EOF-Mark or checksum
		734	if (cSumInFile == 0) //if eof mark has been read, read checksum
		735	cSumInFile = xread32(m_lzoImageFile); //read checksum
		736	if (checksum == cSumInFile)
		737	showDebug(1, "Checksum verified OK");
		738	else
		739	showDebug(1, "Checksum verified NOT OK");
		740	nRes = fclose(m_lzoImageFile);
		741	}
		742	#endif
576	if (nRes)	743	if (nRes)
577	THROW(ERR_ERRNO, errno);	744	THROW(ERR_ERRNO, errno);
578		745
Lines 604-609 void CImage::closeWriting() Link Here
604	nRes = gzclose(m_gzImageFile);	771	nRes = gzclose(m_gzImageFile);
605	else if (m_options.dwCompression == COMPRESS_BZIP2) // Bzip2 compression	772	else if (m_options.dwCompression == COMPRESS_BZIP2) // Bzip2 compression
606	BZ2_bzclose(m_bzImageFile);	773	BZ2_bzclose(m_bzImageFile);
		774	#ifdef LZO_ENABLED
		775	else if (m_options.dwCompression == COMPRESS_LZO) // LZO Compression
		776	{
		777	xwrite32(m_lzoImageFile, 0); //write eof marker
		778	xwrite32(m_lzoImageFile, checksum); // write checksum
		779	nRes = fclose(m_lzoImageFile);
		780	}
		781	#endif
		782
607	if (nRes)	783	if (nRes)
608	THROW(ERR_ERRNO, errno);	784	THROW(ERR_ERRNO, errno);
609		785
Lines 793-798 void CImage::openWriting() Link Here
793	THROW(ERR_ERRNO, errno);	969	THROW(ERR_ERRNO, errno);
794	}	970	}
795	}	971	}
		972	#ifdef LZO_ENABLED
		973	else if (m_options.dwCompression == COMPRESS_LZO) // LZO compression
		974	{
		975	showDebug(1, "open lzo\n");
		976	m_lzoImageFile = fdopen(m_nFdImage, "wb");
		977	if (m_lzoImageFile == NULL)
		978	{
		979	showDebug(1, "error:%d %s\n", errno, strerror(errno));
		980	THROW(ERR_ERRNO, errno);
		981	}
		982	//write magic
		983	static const unsigned char magic[7] =
		984	{ 0x00, 0xe9, 0x4c, 0x5a, 0x4f, 0xff, 0x1a };
		985	xwrite(m_lzoImageFile, magic, sizeof(magic));
		986	xwrite32(m_lzoImageFile, 1); //flags
		987	xputc(m_lzoImageFile, 0x1); //method
		988	xputc(m_lzoImageFile, 1); //comp level
		989	xwrite32(m_lzoImageFile, (256*1024L)); //blocksize
		990	checksum = lzo_adler32(0,NULL,0);
		991	}
		992	#endif
796	else	993	else
797	THROW(ERR_COMP);	994	THROW(ERR_COMP);
798		995
Lines 976-981 void CImage::readAndCheckMagic(char *szM Link Here
976	showDebug(2, "end of ci::readAndCheckMagic: ok\n");	1173	showDebug(2, "end of ci::readAndCheckMagic: ok\n");
977	}	1174	}
978		1175
		1176	#ifdef LZO_ENABLED
		1177	//try to read LZO header, retrun true if it ist LZO
		1178	bool CImage::readLZOHead()
		1179	{
		1180	static const unsigned char magic[7] =
		1181	{ 0x00, 0xe9, 0x4c, 0x5a, 0x4f, 0xff, 0x1a };
		1182	unsigned char m [ sizeof(magic) ];
		1183	if (xread(m_lzoImageFile, m, sizeof(magic), 1) != sizeof(magic) \|\|
		1184	memcmp(m, magic, sizeof(magic)) != 0)
		1185	{
		1186	showDebug(3, "No LZO magic found");
		1187	return false;
		1188	}
		1189
		1190	lzo_uint32 tmp;
		1191	//read rest of header, information not needed now
		1192	tmp = xread32(m_lzoImageFile); //flags always 1
		1193	tmp = xgetc(m_lzoImageFile); //method always 1
		1194	tmp = xgetc(m_lzoImageFile); // level always 1, if not something is wrong
		1195	if (tmp != 1)
		1196	{
		1197	showDebug(4, "Unknown LZO-Level: %d", tmp);
		1198	return false;
		1199	}
		1200
		1201	tmp = xread32(m_lzoImageFile); //blocksize
		1202	if (tmp < 1024 \|\| tmp > 1024*1024L)
		1203	{
		1204	showDebug(3,"Unknown Blocksize: %d", tmp);
		1205	return false;
		1206	}
		1207
		1208	//init checksum
		1209	checksum = lzo_adler32(0,NULL,0);
		1210
		1211	return true;
		1212	}//readLZOHead
		1213	#endif
		1214
979	// =======================================================	1215	// =======================================================
980	// may throw canceled	1216	// may throw canceled
981	// may throw opened, errno, comp (from cid)	1217	// may throw opened, errno, comp (from cid)
Lines 1105-1110 void CImage::openReading(CVolumeHeader * Link Here
1105	else	1341	else
1106	showDebug(1, "bzip2 open\n");	1342	showDebug(1, "bzip2 open\n");
1107	}	1343	}
		1344	else if (m_options.dwCompression == COMPRESS_LZO) // lzo compression
		1345	{
		1346	#ifdef LZO_ENABLED
		1347	m_lzoImageFile = fdopen(m_nFdImage, "rb");
		1348	if (m_lzoImageFile == NULL)
		1349	THROW(ERR_ERRNO, errno);
		1350	else
		1351	showDebug(1, "lzo open\n");
		1352	readLZOHead();
		1353	if (lzo_init() != LZO_E_OK)
		1354	{
		1355	showDebug(1, "LZO init failed");
		1356	THROW (errno);
		1357	}
		1358	#else
		1359	showDebug(1, "NO LZO support, but this is an LZO compressed image");
		1360	THROW (1);
		1361	#endif
		1362	}
1108	else	1363	else
1109	THROW(ERR_COMP);	1364	THROW(ERR_COMP);
1110		1365

Lines 43-48 class CImage Link Here

(-)partimage-0.6.7/src/client/imagefile.h (+14 lines)
43	FILE *m_fImageFile;	43	FILE *m_fImageFile;
44	gzFile *m_gzImageFile;	44	gzFile *m_gzImageFile;
45	BZFILE *m_bzImageFile;	45	BZFILE *m_bzImageFile;
		46	FILE *m_lzoImageFile;
46		47
47	int m_nFdImage;	48	int m_nFdImage;
48		49
Lines 51-56 class CImage Link Here
51	char m_szMountDevice[MAXPATHLEN];	52	char m_szMountDevice[MAXPATHLEN];
52	char m_szMountPoint[MAXPATHLEN];	53	char m_szMountPoint[MAXPATHLEN];
53	char m_szMountFS[MAXPATHLEN];	54	char m_szMountFS[MAXPATHLEN];
		55	#ifdef LZO_ENABLED
		56	lzo_uint32 checksum;
		57	bool readLZOHead();
		58	#endif
54		59
55	public:	60	public:
56	CImage(COptions * options);	61	CImage(COptions * options);
Lines 93-98 class CImage Link Here
93	void closeReading(bool bForceExit = false);	98	void closeReading(bool bForceExit = false);
94	void closeWriting();	99	void closeWriting();
95		100
		101	#ifdef LZO_ENABLED
		102	lzo_uint xread(FILE *f, lzo_voidp buf, lzo_uint len, lzo_bool allow_eof);
		103	lzo_uint xwrite(FILE *f, const lzo_voidp buf, lzo_uint len);
		104	void xputc(FILE *f, int c);
		105	int xgetc(FILE *f);
		106	lzo_uint32 xread32(FILE *f);
		107	void xwrite32(FILE *f, lzo_uint32 v);
		108	#endif
		109
96	// magic strings	110	// magic strings
97	void readAndCheckMagic(char *szMagicString);	111	void readAndCheckMagic(char *szMagicString);
98	void writeMagic(char *szMagicString);	112	void writeMagic(char *szMagicString);

Lines 257-268 int main(int argc, char *argv[]) Link Here

(-)partimage-0.6.7/src/client/main.cpp (+12 lines)
257	break;	257	break;
258	case 'z': // compression level	258	case 'z': // compression level
259	options.dwCompression = atol(optarg);	259	options.dwCompression = atol(optarg);
		260	#ifdef LZO_ENABLED
		261	if ((options.dwCompression < 0) \|\| (options.dwCompression > 3))
		262	{
		263	fprintf(stderr, i18n("Compression mode must be 0 (none), "
		264	"1(gzip), 2(bzip2), 3(lzo)\n"));
		265	return EXIT_FAILURE;
		266	}
		267	#else
260	if ((options.dwCompression < 0) \|\| (options.dwCompression > 2))	268	if ((options.dwCompression < 0) \|\| (options.dwCompression > 2))
261	{	269	{
262	fprintf(stderr, i18n("Compression mode must be 0 (none), "	270	fprintf(stderr, i18n("Compression mode must be 0 (none), "
263	"1(gzip), 2(bzip2)\n"));	271	"1(gzip), 2(bzip2)\n"));
264	return EXIT_FAILURE;	272	return EXIT_FAILURE;
265	}	273	}
		274	#endif
266	break;	275	break;
267		276
268	case 'f': // what to do when finished successfully ?	277	case 'f': // what to do when finished successfully ?
Lines 949-954 void usage() Link Here
949	" -z0, --compress=0 don't compress: very fast but very big image file\n"	958	" -z0, --compress=0 don't compress: very fast but very big image file\n"
950	" -z1, --compress=1 compress using gzip: fast and small image file (default)\n"	959	" -z1, --compress=1 compress using gzip: fast and small image file (default)\n"
951	" -z2, --compress=2 (compress using bzip2: very slow and very small image file):\n"	960	" -z2, --compress=2 (compress using bzip2: very slow and very small image file):\n"
		961	#ifdef LZO_ENABLED
		962	" -z3, --compress=3 LZO compression\n"
		963	#endif
952	"* -c, --nocheck don't check the partition before saving\n"	964	"* -c, --nocheck don't check the partition before saving\n"
953	"* -o, --overwrite overwrite the existing image file without confirmation\n"	965	"* -o, --overwrite overwrite the existing image file without confirmation\n"
954	"* -d, --nodesc don't ask any description for the image file\n"	966	"* -d, --nodesc don't ask any description for the image file\n"




    else if (options->dwCompression == 1) +      fprintf(stderr,"partimage: status: Image type: GZIP\n");
    else if (options->dwCompression == 2)
      fprintf(stderr,"partimage: status: Image type: BZIP2\n");
#ifdef LZO_ENABLED
    else if (options->dwCompression == 3)
      fprintf(stderr,"partimage: status: Image type: LZO\n");
#endif
  }  
  try { image.write(&headMain, sizeof(CMainHeader), true); }
  catch ( CExceptions * excep )

  {
          showDebug(3,"szFullyBatchMode=%s\n, len=%d",options->szFullyBatchMode,strlen(options->szFullyBatchMode));
    options->dwCompression = (DWORD) image.getCompressionLevelForImage(szImageName);
  fprintf(stderr,"Komression: %d", options->dwCompression);
    fprintf(stderr,"partimage: status: Partimage: %s\n", headMain.szVersion);
    if (options->dwCompression == 0)
      fprintf(stderr,"partimage: status: Image type: NONE\n");

      fprintf(stderr,"partimage: status: Image type: GZIP\n");
    else if (options->dwCompression == 2)
      fprintf(stderr,"partimage: status: Image type: BZIP2\n");
#ifdef LZO_ENABLED
    else if (options->dwCompression == 3)
      fprintf(stderr,"partimage: status: Image type: LZO\n");
#endif
  }
  g_interface -> StatusLine(i18n("Restoring partition from the image file..."));


Lines 45-50 Link Here

(-)partimage-0.6.7/src/shared/common.cpp (+3 lines)
45		45
46	#include <zlib.h> // gzip compression	46	#include <zlib.h> // gzip compression
47	#include <bzlib.h> // bzip2 compression	47	#include <bzlib.h> // bzip2 compression
		48	#ifdef LZO_ENABLED
		49	#include <lzo1x.h> //lzo compression
		50	#endif
48	#include <string.h>	51	#include <string.h>
49		52
50	#include "common.h"	53	#include "common.h"

Lines 319-325 int CImageDisk::getCompressionLevelForIm Link Here

(-)partimage-0.6.7/src/shared/image_disk.cpp (-1 / +1 lines)
319	fclose(fImageFile);	319	fclose(fImageFile);
320	if (dwRes != 16)	320	if (dwRes != 16)
321	goto checkBzip2;	321	goto checkBzip2;
322	if (strncmp(cBuf+1, "LZO", 3) == 0)	322	if (strncmp(cBuf+2, "LZO", 3) == 0)
323	RETURN_int(COMPRESS_LZO);	323	RETURN_int(COMPRESS_LZO);
324		324
325	showDebug(3, "TRACE_002\n");	325	showDebug(3, "TRACE_002\n");

Lines 25-30 Link Here

(-)partimage-0.6.7/src/shared/image_disk.h (+1 lines)
25		25
26	#include <zlib.h> // gzip compression	26	#include <zlib.h> // gzip compression
27	#include <bzlib.h> // bzip2 compression	27	#include <bzlib.h> // bzip2 compression
		28	#include <lzo1x.h> // lzo compression
28	#include <string.h>	29	#include <string.h>
29		30
30	// ================================================	31	// ================================================

Return to bug 244617

Line 0 Link Here

(-)partimage-0.6.7/README.lzo (+20 lines)
	1
	2	Partition Image LZO-PATCH
	3	-------------------
	4	copyright : (C) 2008 by Max Bidlingmaier
	5
	6	AUTHOR: Max Bidlingmaier
	7	Contact: mbidlingmaier at esigma dash technology dot com
	8
	9	This program is free software; you can redistribute it and/or modify
	10	it under the terms of the GNU General Public License as published by
	11	the Free Software Foundation; either version 2 of the License, or
	12	at your option) any later version.
	13
	14	This Patch enables LZO-compression for Partition Image. LZO is about 3-4 times faster
	15	than gzip at the cost of some compression ration (http://www.oberhumer.com/opensource/lzo/)
	16
	17	To use LZO-compression apply the patch and use configure with --enable-lzo, additional tags are
	18	--with-lzo-headers and --with-lzo-lib if configure is unable to find headers and libs
	19
	20	This Patch is against Partimage 0.6.7

Lines 8-14 AC_REVISION([[$Revision: 1.4 $]]) Link Here

(-)partimage-0.6.7/configure.ac (-1 / +34 lines)
8		8
9	AC_PREREQ(2.59c)	9	AC_PREREQ(2.59c)
10		10
11	AC_INIT([partimage], [0.6.7])	11	AC_INIT([partimage], [0.6.7-lzo])
12		12
13	AC_CANONICAL_SYSTEM	13	AC_CANONICAL_SYSTEM
14	AC_CONFIG_MACRO_DIR([m4])	14	AC_CONFIG_MACRO_DIR([m4])
Lines 136-141 AC_ARG_WITH(ssl-lib, Link Here
136	LIBS="$LIBS -L$withval"	136	LIBS="$LIBS -L$withval"
137	)	137	)
138		138
		139	#lzo enabled
		140	AC_ARG_ENABLE(lzo,
		141	[--enable-lzo Enable LZO-Compression],
		142	LZO=$enableval,
		143	LZO=no
		144	)
		145
		146	AC_ARG_WITH(lzo-headers,
		147	[--with-lzo-headers=DIR LZO Include files location],
		148	LZO_HDR_DIR="$withval"
		149	CPPFLAGS="$CPPFLAGS -I$withval"
		150	)
		151
		152	AC_ARG_WITH(lzo-lib,
		153	[--with-lzo-lib=DIR LZO Library location],
		154	LIBS="$LIBS -L$withval"
		155	)
		156
139	dnl SLang location	157	dnl SLang location
140	AC_ARG_WITH(slang-headers,	158	AC_ARG_WITH(slang-headers,
141	[--with-slang-headers=DIR SLang Include files location],	159	[--with-slang-headers=DIR SLang Include files location],
Lines 253-258 if test "$SSL" = "yes"; then Link Here
253	)	271	)
254	fi	272	fi
255		273
		274	if test "$LZO" = "yes"; then
		275
		276	AC_MSG_RESULT()
		277	AC_CHECKING([ for LZO Library Header files ... ])
		278	AC_SEARCH_HEADERS(lzo1x.h lzoconf.h, $LZO_HDR_DIR /usr/include /usr/include/lzo,
		279	[ AC_CHECK_LIB(lzo, lzo1x_1_compress, [LIBS="$LIBS -llzo"],
		280	AC_MSG_ERROR([ Required for LZO Compression Library not found. ])
		281	)
		282	],
		283	AC_MSG_ERROR([ LZO Headers not found. ])
		284	)
		285	AC_DEFINE([LZO_ENABLED], 1,
		286	AC_MSG_ERROR([Define to 1 if LZO is enabled]))
		287	fi
		288
256	dnl Client must login.	289	dnl Client must login.
257	dnl Don't remove the comma, it's required.	290	dnl Don't remove the comma, it's required.
258	AC_ARG_ENABLE(login,	291	AC_ARG_ENABLE(login,

Lines 550-557 void savePartition(char *szDevice, char Link Here

(-)partimage-0.6.7/src/client/misc.cpp (+5 lines)
550	else if (options->dwCompression == 1) + fprintf(stderr,"partimage: status: Image type: GZIP\n");	550	else if (options->dwCompression == 1) + fprintf(stderr,"partimage: status: Image type: GZIP\n");
551	else if (options->dwCompression == 2)	551	else if (options->dwCompression == 2)
552	fprintf(stderr,"partimage: status: Image type: BZIP2\n");	552	fprintf(stderr,"partimage: status: Image type: BZIP2\n");
		553	#ifdef LZO_ENABLED
553	else if (options->dwCompression == 3)	554	else if (options->dwCompression == 3)
554	fprintf(stderr,"partimage: status: Image type: LZO\n");	555	fprintf(stderr,"partimage: status: Image type: LZO\n");
		556	#endif
555	}	557	}
556	try { image.write(&headMain, sizeof(CMainHeader), true); }	558	try { image.write(&headMain, sizeof(CMainHeader), true); }
557	catch ( CExceptions * excep )	559	catch ( CExceptions * excep )
Lines 947-952 void restorePartition(char *szDevice, ch Link Here
947	{	949	{
948	showDebug(3,"szFullyBatchMode=%s\n, len=%d",options->szFullyBatchMode,strlen(options->szFullyBatchMode));	950	showDebug(3,"szFullyBatchMode=%s\n, len=%d",options->szFullyBatchMode,strlen(options->szFullyBatchMode));
949	options->dwCompression = (DWORD) image.getCompressionLevelForImage(szImageName);	951	options->dwCompression = (DWORD) image.getCompressionLevelForImage(szImageName);
		952	fprintf(stderr,"Komression: %d", options->dwCompression);
950	fprintf(stderr,"partimage: status: Partimage: %s\n", headMain.szVersion);	953	fprintf(stderr,"partimage: status: Partimage: %s\n", headMain.szVersion);
951	if (options->dwCompression == 0)	954	if (options->dwCompression == 0)
952	fprintf(stderr,"partimage: status: Image type: NONE\n");	955	fprintf(stderr,"partimage: status: Image type: NONE\n");
Lines 954-961 void restorePartition(char *szDevice, ch Link Here
954	fprintf(stderr,"partimage: status: Image type: GZIP\n");	957	fprintf(stderr,"partimage: status: Image type: GZIP\n");
955	else if (options->dwCompression == 2)	958	else if (options->dwCompression == 2)
956	fprintf(stderr,"partimage: status: Image type: BZIP2\n");	959	fprintf(stderr,"partimage: status: Image type: BZIP2\n");
		960	#ifdef LZO_ENABLED
957	else if (options->dwCompression == 3)	961	else if (options->dwCompression == 3)
958	fprintf(stderr,"partimage: status: Image type: LZO\n");	962	fprintf(stderr,"partimage: status: Image type: LZO\n");
		963	#endif
959	}	964	}
960	g_interface -> StatusLine(i18n("Restoring partition from the image file..."));	965	g_interface -> StatusLine(i18n("Restoring partition from the image file..."));
961		966