disk.cpp (bed-3.0.3.src.tar.xz) | : | disk.cpp (bed-3.1.0.src.tar.xz) | ||
---|---|---|---|---|
#include "desturbe.h" | #include "desturbe.h" | |||
#include "system.h" | #include "system.h" | |||
#include "editor.h" | #include "editor.h" | |||
#include "main.h" | #include "main.h" | |||
#include "dialog.h" | #include "dialog.h" | |||
#define erroruit printf | #define erroruit printf | |||
#if defined(USE_WINFILE)||defined(__linux__) | #if defined(USE_WINFILE)||defined(__linux__) | |||
#ifdef USE_WINFILE | #ifdef USE_WINFILE | |||
#include <windows.h> | #include <windows.h> | |||
#ifdef __CYGWIN | ||||
#include <w32api/winbase.h> | #include <w32api/winbase.h> | |||
#include <w32api/winioctl.h> | #include <w32api/winioctl.h> | |||
#include <stdio.h> | ||||
#include <w32api/winnt.h> | #include <w32api/winnt.h> | |||
#include <WinIoCtl.h> | #endif | |||
#include <stdio.h> | ||||
#include <winioctl.h> | ||||
//#include <WinIoCtl.h> | ||||
#include "win.h" | #include "win.h" | |||
#endif | #endif | |||
#ifdef __linux__ | #ifdef __linux__ | |||
#include <sys/stat.h> | #include <sys/stat.h> | |||
#include <sys/sysmacros.h> | #include <sys/sysmacros.h> | |||
#endif | #endif | |||
#ifdef _WIN32 | #ifdef _WIN32 | |||
inline FILEHANDLE opennothing(const char *filename) {return CreateFile(filename , 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING,0,NULL); } | inline FILEHANDLE opennothing(const char *filename) {return CreateFile(filename , 0, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING,0,NULL); } | |||
#else | #else | |||
skipping to change at line 690 | skipping to change at line 693 | |||
return -2; | return -2; | |||
} | } | |||
} | } | |||
} | } | |||
editup(); | editup(); | |||
freearray(devices,disknr); | freearray(devices,disknr); | |||
return 0; | return 0; | |||
} | } | |||
#endif | #endif | |||
#ifndef __MINGW32__ | ||||
#include <grp.h> | #include <grp.h> | |||
#include <pwd.h> | #include <pwd.h> | |||
#include <sys/types.h> | #include <sys/types.h> | |||
#endif | ||||
#define perms(x,el) ((x&(1<<el))?(permsym[el]):'-') | #define perms(x,el) ((x&(1<<el))?(permsym[el]):'-') | |||
#include "dialog.h" | #include "dialog.h" | |||
#ifdef _WIN32 | #ifdef _WIN32 | |||
extern char * expanddisk(const char * const name,char *const filename) ; | extern char * expanddisk(const char * const name,char *const filename) ; | |||
inline bool driveletter( const char * const name) {return (name[3]=='\\'&&name[ 5]==':'&&!name[6]&&(name[2]=='.'||name[2]=='?')) ; } | inline bool driveletter( const char * const name) {return (name[3]=='\\'&&name[ 5]==':'&&!name[6]&&(name[2]=='.'||name[2]=='?')) ; } | |||
inline BOOL diskvolume(char *Name,int len) { | inline BOOL diskvolume(char *Name,int len) { | |||
End of changes. 5 change blocks. | ||||
2 lines changed or deleted | 7 lines changed or added |