added full ntfs support. (couldn't test it very will due to the absence of
* include/GParted_Core.h, src/GParted_Core.cc, src/Makefile.am, include/ntfs.h, src/ntfs.cc: added full ntfs support. (couldn't test it very will due to the absence of a win32 box :P )
This commit is contained in:
parent
d6be9833ff
commit
88a637f13d
|
@ -1,3 +1,11 @@
|
|||
2004-11-23 Bart Hakvoort <gparted@users.sf.net>
|
||||
|
||||
* include/GParted_Core.h,
|
||||
src/GParted_Core.cc,
|
||||
src/Makefile.am,
|
||||
include/ntfs.h,
|
||||
src/ntfs.cc: added full ntfs support. (couldn't test it very will due to the absence of a win32 box :P )
|
||||
|
||||
2004-11-22 Bart Hakvoort <gparted@users.sf.net>
|
||||
|
||||
* include/Utils.h: fixed crasher with unknown filesystems.
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "../include/fat32.h"
|
||||
#include "../include/linux_swap.h"
|
||||
#include "../include/reiserfs.h"
|
||||
#include "../include/ntfs.h"
|
||||
|
||||
#include <glibmm/ustring.h>
|
||||
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
/* Copyright (C) 2004 Bart
|
||||
*
|
||||
* 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 program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef NTFS
|
||||
#define NTFS
|
||||
|
||||
#include "../include/FileSystem.h"
|
||||
|
||||
namespace GParted
|
||||
{
|
||||
|
||||
class ntfs : public FileSystem
|
||||
{
|
||||
public:
|
||||
FS get_filesystem_support( ) ;
|
||||
void Set_Used_Sectors( Partition & partition ) ;
|
||||
bool Create( const Glib::ustring device_path, const Partition & new_partition ) ;
|
||||
bool Resize( const Partition & partition_new, bool fill_partition = false ) ;
|
||||
bool Copy( const Glib::ustring & src_part_path, const Glib::ustring & dest_part_path ) ;
|
||||
bool Check_Repair( const Partition & partition ) ;
|
||||
int get_estimated_time( long MB_to_Consider ) ;
|
||||
};
|
||||
|
||||
} //GParted
|
||||
|
||||
#endif //NTFS
|
|
@ -39,6 +39,9 @@ void GParted_Core::find_supported_filesystems( )
|
|||
reiserfs fs_reiserfs;
|
||||
FILESYSTEMS .push_back( fs_reiserfs .get_filesystem_support( ) ) ;
|
||||
|
||||
ntfs fs_ntfs;
|
||||
FILESYSTEMS .push_back( fs_ntfs .get_filesystem_support( ) ) ;
|
||||
|
||||
//unknown filesystem (default when no match is found)
|
||||
FS fs ; fs .filesystem = "unknown" ;
|
||||
FILESYSTEMS .push_back( fs ) ;
|
||||
|
@ -593,6 +596,8 @@ void GParted_Core::set_proper_filesystem( const Glib::ustring & filesystem )
|
|||
p_filesystem = new linux_swap( ) ;
|
||||
else if ( filesystem == "reiserfs" )
|
||||
p_filesystem = new reiserfs( ) ;
|
||||
else if ( filesystem == "ntfs" )
|
||||
p_filesystem = new ntfs( ) ;
|
||||
else
|
||||
p_filesystem = NULL ;
|
||||
|
||||
|
|
|
@ -36,7 +36,8 @@ gparted_SOURCES = \
|
|||
fat16.cc\
|
||||
fat32.cc\
|
||||
linux_swap.cc\
|
||||
reiserfs.cc
|
||||
reiserfs.cc\
|
||||
ntfs.cc
|
||||
|
||||
gparted_LDFLAGS = -lparted -lgthread-2.0
|
||||
|
||||
|
|
|
@ -0,0 +1,109 @@
|
|||
/* Copyright (C) 2004 Bart
|
||||
*
|
||||
* 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 program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
|
||||
#include "../include/ntfs.h"
|
||||
|
||||
namespace GParted
|
||||
{
|
||||
|
||||
FS ntfs::get_filesystem_support( )
|
||||
{
|
||||
FS fs ;
|
||||
|
||||
fs .filesystem = "ntfs" ;
|
||||
if ( ! system( "which ntfscluster 1>/dev/null 2>/dev/null" ) )
|
||||
fs .read = true ;
|
||||
|
||||
if ( ! system( "which mkntfs 1>/dev/null 2>/dev/null" ) )
|
||||
fs .create = true ;
|
||||
|
||||
if ( ! system( "which ntfsfix 1>/dev/null 2>/dev/null" ) )
|
||||
fs .check = true ;
|
||||
|
||||
//resizing is a delicate process which requires 3 commands..
|
||||
if ( ! system( "which ntfsresize 1>/dev/null 2>/dev/null" ) && fs .read && fs .check )
|
||||
fs .resize = true ;
|
||||
|
||||
//we need resize to set correct used/unused after cloning
|
||||
if ( ! system( "which ntfsclone 1>/dev/null 2>/dev/null" ) && fs .resize )
|
||||
fs .copy = true ;
|
||||
|
||||
return fs ;
|
||||
}
|
||||
|
||||
void ntfs::Set_Used_Sectors( Partition & partition )
|
||||
{
|
||||
char c_buf[ 512 ] ;
|
||||
FILE *f ;
|
||||
|
||||
Glib::ustring output ;
|
||||
Sector free_sectors = -1 ;
|
||||
|
||||
//get free sectors..
|
||||
f = popen( ( "ntfscluster --force " + partition .partition ) .c_str( ), "r" ) ;
|
||||
while ( fgets( c_buf, 512, f ) )
|
||||
{
|
||||
output = Glib::locale_to_utf8( c_buf ) ;
|
||||
|
||||
//free sectors
|
||||
if ( output .find( "sectors of free space" ) < output .length( ) )
|
||||
free_sectors = atoi( (output .substr( output .find( ":" ) +1, output .length( ) ) ) .c_str( ) ) ;
|
||||
}
|
||||
pclose( f ) ;
|
||||
|
||||
if ( free_sectors > -1 )
|
||||
partition .Set_Unused( free_sectors ) ;
|
||||
}
|
||||
|
||||
bool ntfs::Create( const Glib::ustring device_path, const Partition & new_partition )
|
||||
{
|
||||
return Execute_Command( "mkntfs -Q " + new_partition .partition ) ;
|
||||
}
|
||||
|
||||
bool ntfs::Resize( const Partition & partition_new, bool fill_partition )
|
||||
{
|
||||
Glib::ustring str_temp = "echo y | ntfsresize -f " + partition_new .partition ;
|
||||
|
||||
if ( ! fill_partition )
|
||||
str_temp += " -s " + num_to_str( partition_new .Get_Length_MB( ) - cylinder_size ) + "M" ;
|
||||
|
||||
return Execute_Command( str_temp ) ;
|
||||
}
|
||||
|
||||
bool ntfs::Copy( const Glib::ustring & src_part_path, const Glib::ustring & dest_part_path )
|
||||
{
|
||||
Execute_Command( "ntfsclone -f --overwrite " + dest_part_path + " " + src_part_path ) ;
|
||||
|
||||
//resize to full to set correct used/unused
|
||||
return Execute_Command( "echo y | ntfsresize -f " + dest_part_path ) ;
|
||||
}
|
||||
|
||||
bool ntfs::Check_Repair( const Partition & partition )
|
||||
{
|
||||
return Execute_Command( "ntfsfix " + partition .partition ) ;
|
||||
}
|
||||
|
||||
int ntfs::get_estimated_time( long MB_to_Consider )
|
||||
{
|
||||
return -1 ;
|
||||
}
|
||||
|
||||
|
||||
} //GParted
|
||||
|
||||
|
Loading…
Reference in New Issue