Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite56756e

Browse files
committed
Use Unix line endings instead of DOS ones, per Magnus.
1 parente2fee8c commite56756e

File tree

3 files changed

+329
-329
lines changed

3 files changed

+329
-329
lines changed

‎src/include/port/win32_msvc/dirent.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
/*
2-
* Headers for port/dirent.c, win32 native implementation of dirent functions
3-
*
4-
* $PostgreSQL: pgsql/src/include/port/win32_msvc/dirent.h,v 1.1 2006/06/07 22:24:45 momjian Exp $
5-
*/
6-
7-
#ifndef_WIN32VC_DIRENT_H
8-
#define_WIN32VC_DIRENT_H
9-
structdirent {
10-
longd_ino;
11-
unsigned shortd_reclen;
12-
unsigned shortd_namlen;
13-
chard_name[MAX_PATH];
14-
};
15-
16-
typedefstructDIRDIR;
17-
18-
DIR*opendir(constchar*);
19-
structdirent*readdir(DIR*);
20-
intclosedir(DIR*);
21-
#endif
1+
/*
2+
* Headers for port/dirent.c, win32 native implementation of dirent functions
3+
*
4+
* $PostgreSQL: pgsql/src/include/port/win32_msvc/dirent.h,v 1.2 2006/06/26 12:59:44 momjian Exp $
5+
*/
6+
7+
#ifndef_WIN32VC_DIRENT_H
8+
#define_WIN32VC_DIRENT_H
9+
structdirent {
10+
longd_ino;
11+
unsigned shortd_reclen;
12+
unsigned shortd_namlen;
13+
chard_name[MAX_PATH];
14+
};
15+
16+
typedefstructDIRDIR;
17+
18+
DIR*opendir(constchar*);
19+
structdirent*readdir(DIR*);
20+
intclosedir(DIR*);
21+
#endif

‎src/port/dirent.c

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,108 @@
1-
/*-------------------------------------------------------------------------
2-
*
3-
* dirent.c
4-
* opendir/readdir/closedir for win32/msvc
5-
*
6-
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
7-
* Portions Copyright (c) 1994, Regents of the University of California
8-
*
9-
*
10-
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/port/dirent.c,v 1.1 2006/06/07 22:24:46 momjian Exp $
12-
*
13-
*-------------------------------------------------------------------------
14-
*/
15-
16-
#include"postgres.h"
17-
#include<dirent.h>
18-
19-
20-
structDIR {
21-
char*dirname;
22-
structdirentret;/* Used to return to caller */
23-
HANDLEhandle;
24-
};
25-
26-
DIR*opendir(constchar*dirname)
27-
{
28-
DWORDattr;
29-
DIR*d;
30-
31-
/* Make sure it is a directory */
32-
attr=GetFileAttributes(dirname);
33-
if (attr==INVALID_FILE_ATTRIBUTES)
34-
{
35-
errno=ENOENT;
36-
returnNULL;
37-
}
38-
if ((attr&FILE_ATTRIBUTE_DIRECTORY)!=FILE_ATTRIBUTE_DIRECTORY)
39-
{
40-
errno=ENOTDIR;
41-
returnNULL;
42-
}
43-
44-
d=malloc(sizeof(DIR));
45-
if (!d)
46-
{
47-
errno=ENOMEM;
48-
returnNULL;
49-
}
50-
d->dirname=malloc(strlen(dirname)+4);
51-
if (!d->dirname)
52-
{
53-
errno=ENOMEM;
54-
free(d);
55-
returnNULL;
56-
}
57-
strcpy(d->dirname,dirname);
58-
if (d->dirname[strlen(d->dirname)-1]!='/'&&
59-
d->dirname[strlen(d->dirname)-1]!='\\')
60-
strcat(d->dirname,"\\");/* Append backslash if not already there */
61-
strcat(d->dirname,"*");/* Search for entries named anything */
62-
d->handle=INVALID_HANDLE_VALUE;
63-
d->ret.d_ino=0;/* no inodes on win32 */
64-
d->ret.d_reclen=0;/* not used on win32 */
65-
66-
returnd;
67-
}
68-
69-
structdirent*readdir(DIR*d)
70-
{
71-
WIN32_FIND_DATAfd;
72-
73-
if (d->handle==INVALID_HANDLE_VALUE)
74-
{
75-
d->handle=FindFirstFile(d->dirname,&fd);
76-
if (d->handle==INVALID_HANDLE_VALUE)
77-
{
78-
errno=ENOENT;
79-
returnNULL;
80-
}
81-
}
82-
else
83-
{
84-
if (!FindNextFile(d->handle,&fd))
85-
{
86-
if (GetLastError()==ERROR_NO_MORE_FILES)
87-
{
88-
/* No more files, force errno=0 (unlike mingw) */
89-
errno=0;
90-
returnNULL;
91-
}
92-
_dosmaperr(GetLastError());
93-
returnNULL;
94-
}
95-
}
96-
strcpy(d->ret.d_name,fd.cFileName);/* Both strings are MAX_PATH long */
97-
d->ret.d_namlen=strlen(d->ret.d_name);
98-
return&d->ret;
99-
}
100-
101-
intclosedir(DIR*d)
102-
{
103-
if (d->handle!=INVALID_HANDLE_VALUE)
104-
FindClose(d->handle);
105-
free(d->dirname);
106-
free(d);
107-
return0;
108-
}
1+
/*-------------------------------------------------------------------------
2+
*
3+
* dirent.c
4+
* opendir/readdir/closedir for win32/msvc
5+
*
6+
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
7+
* Portions Copyright (c) 1994, Regents of the University of California
8+
*
9+
*
10+
* IDENTIFICATION
11+
* $PostgreSQL: pgsql/src/port/dirent.c,v 1.2 2006/06/26 12:58:17 momjian Exp $
12+
*
13+
*-------------------------------------------------------------------------
14+
*/
15+
16+
#include"postgres.h"
17+
#include<dirent.h>
18+
19+
20+
structDIR {
21+
char*dirname;
22+
structdirentret;/* Used to return to caller */
23+
HANDLEhandle;
24+
};
25+
26+
DIR*opendir(constchar*dirname)
27+
{
28+
DWORDattr;
29+
DIR*d;
30+
31+
/* Make sure it is a directory */
32+
attr=GetFileAttributes(dirname);
33+
if (attr==INVALID_FILE_ATTRIBUTES)
34+
{
35+
errno=ENOENT;
36+
returnNULL;
37+
}
38+
if ((attr&FILE_ATTRIBUTE_DIRECTORY)!=FILE_ATTRIBUTE_DIRECTORY)
39+
{
40+
errno=ENOTDIR;
41+
returnNULL;
42+
}
43+
44+
d=malloc(sizeof(DIR));
45+
if (!d)
46+
{
47+
errno=ENOMEM;
48+
returnNULL;
49+
}
50+
d->dirname=malloc(strlen(dirname)+4);
51+
if (!d->dirname)
52+
{
53+
errno=ENOMEM;
54+
free(d);
55+
returnNULL;
56+
}
57+
strcpy(d->dirname,dirname);
58+
if (d->dirname[strlen(d->dirname)-1]!='/'&&
59+
d->dirname[strlen(d->dirname)-1]!='\\')
60+
strcat(d->dirname,"\\");/* Append backslash if not already there */
61+
strcat(d->dirname,"*");/* Search for entries named anything */
62+
d->handle=INVALID_HANDLE_VALUE;
63+
d->ret.d_ino=0;/* no inodes on win32 */
64+
d->ret.d_reclen=0;/* not used on win32 */
65+
66+
returnd;
67+
}
68+
69+
structdirent*readdir(DIR*d)
70+
{
71+
WIN32_FIND_DATAfd;
72+
73+
if (d->handle==INVALID_HANDLE_VALUE)
74+
{
75+
d->handle=FindFirstFile(d->dirname,&fd);
76+
if (d->handle==INVALID_HANDLE_VALUE)
77+
{
78+
errno=ENOENT;
79+
returnNULL;
80+
}
81+
}
82+
else
83+
{
84+
if (!FindNextFile(d->handle,&fd))
85+
{
86+
if (GetLastError()==ERROR_NO_MORE_FILES)
87+
{
88+
/* No more files, force errno=0 (unlike mingw) */
89+
errno=0;
90+
returnNULL;
91+
}
92+
_dosmaperr(GetLastError());
93+
returnNULL;
94+
}
95+
}
96+
strcpy(d->ret.d_name,fd.cFileName);/* Both strings are MAX_PATH long */
97+
d->ret.d_namlen=strlen(d->ret.d_name);
98+
return&d->ret;
99+
}
100+
101+
intclosedir(DIR*d)
102+
{
103+
if (d->handle!=INVALID_HANDLE_VALUE)
104+
FindClose(d->handle);
105+
free(d->dirname);
106+
free(d);
107+
return0;
108+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp