Changeset 19275 for gsdl


Ignore:
Timestamp:
2009-04-27T17:37:46+12:00 (15 years ago)
Author:
davidb
Message:

Initial support for Windows

Location:
gsdl/trunk/common-src/src/getpw
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/common-src/src/getpw/getpw.cpp

    r18493 r19275  
    3030#include "gsdlconf.h"
    3131
    32 // use the standard namespace
    33 #if !defined (GSDL_NAMESPACE_BROKEN)
    34 #if defined(GSDL_USE_OBJECTSPACE)
    35 using namespace ospace::std;
    36 #else
    37 using namespace std;
    38 #endif
    39 #endif
    40 
    4132
    4233// include crypt
    … …  
    6657#endif
    6758
     59// use the standard namespace
     60#if !defined (GSDL_NAMESPACE_BROKEN)
     61#if defined(GSDL_USE_OBJECTSPACE)
     62using namespace ospace::std;
     63#else
     64using namespace std;
     65#endif
     66#endif
     67
     68
    6869#include <string.h>
    69 #include <pwd.h>
     70//#include <pwd.h>
     71
    7072
    7173int main (int argc, char *argv[]) {
    7274
    7375  int password_ok = 0;
    74   char c[10];
     76  char c[129];
    7577  int i;
    7678 
    7779  for (i=0; i<3; i++)  {
     80#if defined(__WIN32__)
     81    cout << "Enter password  (will appear on screen): ";
     82    char a[129];
     83    cin.getline(a, 128);
     84#else
    7885    char *a = getpass("Enter password:");
     86#endif
     87
    7988    int len = strlen (a);
    8089    if (len < 3 || len > 128) {
    … …  
    8594    strcpy (c, a);
    8695
     96#if defined(__WIN32__)
     97    cout << "Re-enter password: ";
     98    char b[129];
     99    cin.getline(b, 128);
     100#else
    87101    char *b = getpass("Re-enter password:"); 
     102#endif
    88103
    89104    if ((strcmp (c, b)) == 0) {

  • gsdl/trunk/common-src/src/getpw/win32.mak

    r19057 r19275  
    2828COMMON_DIR = $(GSDLHOME)\common-src
    2929
    30 INDEXERS_DIR = $(COMMON_DIR)\indexers
    3130COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
    3231
    … …  
    5655CC = cl
    5756DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    58 INCLUDES = -I"$(GSDL_DIR)"
     57INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COMMON_DIR)\packages\windows\crypt\crypt"
     58LIBS = "$(COMMON_DIR)\src\lib\gsdllib.lib" "$(COMMON_DIR)\packages\windows\crypt\crypt\crypt.lib"
     59
    5960
    6061!IF $(GSDL_VC4)
    … …  
    6263INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
    6364!ENDIF
     65
    6466!IF $(LOCAL_LIBRARY)
    6567DEFS = $(DEFS) -DGSDL_LOCAL_LIBRARY
    … …  
    7678
    7779
    78 SOURCES = \
    79     getgw.cpp \
    80     $(SQLITE_SOURCES) \
    81     $(MSSQL_SOURCES)
    82 
    83 OBJECTS = \
    84     getgw.obj \
    85     $(SQLITE_OBJECTS) \
    86         $(MSSQL_OBJECTS)
    87 
    88 
     80SOURCES = getpw.cpp
     81OBJECTS = getpw.obj
    8982EXEC    = getpw.exe
    9083
    … …  
    9992
    10093getpw.exe: $(OBJECTS)
    101         $(LINK) $(OBJECTS) $(LIBS)
     94    $(LINK) $(OBJECTS) $(LIBS)
    10295
    10396
Note: See TracChangeset for help on using the changeset viewer.