[Pkg-crosswire-devel] [Branch ~pkgcrosswire/libsword/main] Rev 40: Really remove unwanted win32/dirent* files.

noreply at launchpad.net noreply at launchpad.net
Sat May 23 21:48:09 BST 2009


------------------------------------------------------------
revno: 40
committer: Jonathan Marsden <jmarsden at fastmail.fm>
branch nick: main
timestamp: Sat 2009-05-23 13:18:10 -0700
message:
  Really remove unwanted win32/dirent* files.
removed:
  src/utilfuns/win32/
  src/utilfuns/win32/dirent.cpp
  src/utilfuns/win32/dirent.h

=== removed directory 'src/utilfuns/win32'
=== removed file 'src/utilfuns/win32/dirent.cpp'
--- src/utilfuns/win32/dirent.cpp	2009-05-15 01:28:57 +0000
+++ src/utilfuns/win32/dirent.cpp	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-/*
-
-    Implementation of POSIX directory browsing functions and types for Win32.
-
-    Kevlin Henney (mailto:kevlin at acm.org), March 1997.
-
-    Copyright Kevlin Henney, 1997. All rights reserved.
-
-    Permission to use, copy, modify, and distribute this software and its
-    documentation for any purpose is hereby granted without fee, provided
-    that this copyright and permissions notice appear in all copies and
-    derivatives, and that no charge may be made for the software and its
-    documentation except to cover cost of distribution.
-    
-    This software is supplied "as is" without express or implied warranty.
-
-    But that said, if there are any problems please get in touch.
-
-*/
-
-#include <dirent.h>
-#include <errno.h>
-#include <io.h>
-#include <stdlib.h>
-#include <string.h>
-
-struct SWDLLEXPORT DIR
-{
-    long                handle; /* -1 for failed rewind */
-    struct _finddata_t  info;
-    struct dirent       result; /* d_name null iff first time */
-    char                *name;  /* NTBS */
-};
-
-SWDLLEXPORT DIR *opendir(const char *name)
-{
-    DIR *dir = 0;
-
-    if(name && name[0])
-    {
-        size_t base_length = strlen(name);
-        const char *all = /* the root directory is a special case... */
-            strchr("/\\", name[base_length - 1]) ? "*" : "/*";
-
-        if((dir = (DIR *) malloc(sizeof *dir)) != 0 &&
-           (dir->name = (char *) malloc(base_length + strlen(all) + 1)) != 0)
-        {
-            strcat(strcpy(dir->name, name), all);
-
-            if((dir->handle = _findfirst(dir->name, &dir->info)) != -1)
-            {
-                dir->result.d_name = 0;
-            }
-            else /* rollback */
-            {
-                free(dir->name);
-                free(dir);
-                dir = 0;
-            }
-        }
-        else /* rollback */
-        {
-            free(dir);
-            dir   = 0;
-            errno = ENOMEM;
-        }
-    }
-    else
-    {
-        errno = EINVAL;
-    }
-
-    return dir;
-}
-
-SWDLLEXPORT int closedir(DIR *dir)
-{
-    int result = -1;
-
-    if(dir)
-    {
-        if(dir->handle != -1)
-        {
-            result = _findclose(dir->handle);
-        }
-
-        free(dir->name);
-        free(dir);
-    }
-
-    if(result == -1) /* map all errors to EBADF */
-    {
-        errno = EBADF;
-    }
-
-    return result;
-}
-
-SWDLLEXPORT struct dirent *readdir(DIR *dir)
-{
-    struct dirent *result = 0;
-
-    if(dir && dir->handle != -1)
-    {
-        if(!dir->result.d_name || _findnext(dir->handle, &dir->info) != -1)
-        {
-            result         = &dir->result;
-            result->d_name = dir->info.name;
-        }
-    }
-    else
-    {
-        errno = EBADF;
-    }
-
-    return result;
-}
-
-SWDLLEXPORT void rewinddir(DIR *dir)
-{
-    if(dir && dir->handle != -1)
-    {
-        _findclose(dir->handle);
-        dir->handle = _findfirst(dir->name, &dir->info);
-        dir->result.d_name = 0;
-    }
-    else
-    {
-        errno = EBADF;
-    }
-}

=== removed file 'src/utilfuns/win32/dirent.h'
--- src/utilfuns/win32/dirent.h	2009-05-15 01:28:57 +0000
+++ src/utilfuns/win32/dirent.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/*
-
-    Declaration of POSIX directory browsing functions and types for Win32.
-
-    Kevlin Henney (mailto:kevlin at acm.org), March 1997.
-
-    Copyright Kevlin Henney, 1997. All rights reserved.
-
-    Permission to use, copy, modify, and distribute this software and its
-    documentation for any purpose is hereby granted without fee, provided
-    that this copyright and permissions notice appear in all copies and
-    derivatives, and that no charge may be made for the software and its
-    documentation except to cover cost of distribution.
-    
-*/
-
-#ifndef DIRENT_INCLUDED
-#define DIRENT_INCLUDED
-
-#include <defs.h>
-
-typedef struct DIR DIR;
-
-struct SWDLLEXPORT dirent
-{
-    char *d_name;
-};
-
-SWDLLEXPORT DIR           *opendir(const char *);
-SWDLLEXPORT int           closedir(DIR *);
-SWDLLEXPORT struct dirent *readdir(DIR *);
-SWDLLEXPORT void          rewinddir(DIR *);
-
-#endif



--
Main packaging branch
https://code.launchpad.net/~pkgcrosswire/libsword/main

Your team Crosswire Packaging Team is subscribed to branch lp:libsword.
To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/libsword/main/+edit-subscription.




More information about the Pkg-crosswire-devel mailing list