From 700c01fa8b8927e46ddfe92662adb5dc73999dd8 Mon Sep 17 00:00:00 2001
From: Colin Leroy-Mira <colin@colino.net>
Date: Thu, 14 Nov 2024 21:57:43 +0100
Subject: [PATCH] Rename dir_file_count to dir_entry_count

---
 doc/apple2.sgml                                    |  2 +-
 doc/apple2enh.sgml                                 |  2 +-
 doc/funcref.sgml                                   | 14 +++++++-------
 include/apple2.h                                   |  2 +-
 .../apple2/{dir_file_count.s => dir_entry_count.s} |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)
 rename libsrc/apple2/{dir_file_count.s => dir_entry_count.s} (74%)

diff --git a/doc/apple2.sgml b/doc/apple2.sgml
index c6b2fe8eb..ffe0e2397 100644
--- a/doc/apple2.sgml
+++ b/doc/apple2.sgml
@@ -332,7 +332,7 @@ usage.
 <item>_datetime
 <item>allow_lowercase
 <item>beep
-<item>dir_file_count
+<item>dir_entry_count
 <item>get_ostype
 <item>gmtime_dt
 <item>mktime_dt
diff --git a/doc/apple2enh.sgml b/doc/apple2enh.sgml
index ea950fa26..fce6127bd 100644
--- a/doc/apple2enh.sgml
+++ b/doc/apple2enh.sgml
@@ -332,7 +332,7 @@ usage.
 <item>_filetype
 <item>_datetime
 <item>beep
-<item>dir_file_count
+<item>dir_entry_count
 <item>get_ostype
 <item>gmtime_dt
 <item>mktime_dt
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 7664739fe..f2dd02efc 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -97,7 +97,7 @@ function.
 <item>_dos_type
 <item>allow_lowercase
 <item><ref id="beep" name="beep">
-<item><ref id="dir_file_count" name="dir_file_count">
+<item><ref id="dir_entry_count" name="dir_entry_count">
 <item><ref id="get_ostype" name="get_ostype">
 <item><ref id="gmtime_dt" name="gmtime_dt">
 <item><ref id="mktime_dt" name="mktime_dt">
@@ -110,7 +110,7 @@ function.
 <itemize>
 <item>_dos_type
 <item><ref id="beep" name="beep">
-<item><ref id="dir_file_count" name="dir_file_count">
+<item><ref id="dir_entry_count" name="dir_entry_count">
 <item><ref id="get_ostype" name="get_ostype">
 <item><ref id="gmtime_dt" name="gmtime_dt">
 <item><ref id="mktime_dt" name="mktime_dt">
@@ -3526,16 +3526,16 @@ used in presence of a prototype.
 </quote>
 
 
-<sect1>dir_file_count<label id="dir_file_count"><p>
+<sect1>dir_entry_count<label id="dir_entry_count"><p>
 
 <quote>
 <descrip>
-<tag/Function/Returns the number of files in the directory.
+<tag/Function/Returns the number of entries in the directory.
 <tag/Header/<tt/<ref id="apple2.h" name="apple2.h">/
-<tag/Declaration/<tt/unsigned int __fastcall__ dir_file_count(DIR *dir);/
-<tag/Description/<tt/dir_file_count/ is machine dependent and does not exist for
+<tag/Declaration/<tt/unsigned int __fastcall__ dir_entry_count(DIR *dir);/
+<tag/Description/<tt/dir_entry_count/ is machine dependent and does not exist for
 all supported targets. If it exists, it returns the number of active
-(non-deleted) files in the directory.
+(non-deleted) files and directories in the directory.
 <tag/Notes/<itemize>
 <item>The function does not exist on all platforms.
 </itemize>
diff --git a/include/apple2.h b/include/apple2.h
index 358d44ac4..15055f412 100644
--- a/include/apple2.h
+++ b/include/apple2.h
@@ -234,7 +234,7 @@ time_t __fastcall__ mktime_dt (const struct datetime* dt);
 
 typedef struct DIR DIR;
 
-unsigned int __fastcall__ dir_file_count(DIR *dir);
+unsigned int __fastcall__ dir_entry_count(DIR *dir);
 /* Returns the number of active files in a ProDOS directory */
 
 #if !defined(__APPLE2ENH__)
diff --git a/libsrc/apple2/dir_file_count.s b/libsrc/apple2/dir_entry_count.s
similarity index 74%
rename from libsrc/apple2/dir_file_count.s
rename to libsrc/apple2/dir_entry_count.s
index aa864e32a..6a80bef28 100644
--- a/libsrc/apple2/dir_file_count.s
+++ b/libsrc/apple2/dir_entry_count.s
@@ -1,17 +1,17 @@
 ;
 ; Colin Leroy-Mira <colin@colino.net>, 2024
 ;
-; unsigned int __fastcall__ dir_file_count(DIR *dir);
+; unsigned int __fastcall__ dir_entry_count(DIR *dir);
 ;
 
-        .export   _dir_file_count
+        .export   _dir_entry_count
 
         .importzp ptr1
 
         .include  "apple2.inc"
         .include  "dir.inc"
 
-.proc _dir_file_count
+.proc _dir_entry_count
         sta       ptr1
         stx       ptr1+1