Update examples

Author: andreax79

examples/fdisk.py

@@ -49,24 +49,29 @@
 
 class Position(cstruct.MemCStruct):
     __byte_order__ = cstruct.LITTLE_ENDIAN
-    __struct__ = """
-        unsigned char head;
-        unsigned char sector;
-        unsigned char cyl;
+    __def__ = """
+        struct {
+            unsigned char head;
+            unsigned char sector;
+            unsigned char cyl;
+        }
     """
 
 
 class Partition(cstruct.MemCStruct):
     __byte_order__ = cstruct.LITTLE_ENDIAN
-    __struct__ = """
+    __def__ = """
         #define ACTIVE_FLAG         0x80
-
-        unsigned char status;       /* 0x80 - active */
-        struct Position start;
-        unsigned char partition_type;
-        struct Position end;
-        unsigned int start_sect;    /* starting sector counting from 0 */
-        unsigned int sectors;       /* nr of sectors in partition */
+        typedef struct Position Position;
+
+        struct {
+            unsigned char status;       /* 0x80 - active */
+            Position start;
+            unsigned char partition_type;
+            Position end;
+            unsigned int start_sect;    /* starting sector counting from 0 */
+            unsigned int sectors;       /* nr of sectors in partition */
+        }
     """
 
     @property
@@ -96,7 +101,7 @@ def __str__(self):
 
 class MBR(cstruct.MemCStruct):
     __byte_order__ = cstruct.LITTLE_ENDIAN
-    __struct__ = """
+    __def__ = """
         #define MBR_SIZE                    512
         #define MBR_DISK_SIGNATURE_SIZE       4
         #define MBR_USUALY_NULLS_SIZE         2
@@ -106,11 +111,15 @@ class MBR(cstruct.MemCStruct):
         #define MBR_PARTITIONS_SIZE  (sizeof(Partition) * MBR_PARTITIONS_NUM)
         #define MBR_UNUSED_SIZE      (MBR_SIZE - MBR_DISK_SIGNATURE_SIZE - MBR_USUALY_NULLS_SIZE - MBR_PARTITIONS_SIZE - MBR_SIGNATURE_SIZE)
 
-        char unused[MBR_UNUSED_SIZE];
-        unsigned char disk_signature[MBR_DISK_SIGNATURE_SIZE];
-        unsigned char usualy_nulls[MBR_USUALY_NULLS_SIZE];
-        struct Partition partitions[MBR_PARTITIONS_NUM];
-        uint16 signature;
+        typedef struct Partition Partition;
+
+        struct {
+            char unused[MBR_UNUSED_SIZE];
+            unsigned char disk_signature[MBR_DISK_SIGNATURE_SIZE];
+            unsigned char usualy_nulls[MBR_USUALY_NULLS_SIZE];
+            Partition partitions[MBR_PARTITIONS_NUM];
+            uint16 signature;
+        }
     """
 
     @property

examples/fdisk.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+cd "$(dirname "$0")/.." || exit
+python -m examples.fdisk $*

examples/flexible_array.py

@@ -6,10 +6,12 @@
 
 
 class FlexArray(MemCStruct):
-    __struct__ = """
-      int length;
-      uint32 checksum;
-      long data[];
+    __def__ = """
+        struct {
+            int length;
+            uint32 checksum;
+            long data[];
+        }
     """
 
     def set_length(self, length):

examples/flexible_array.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+cd "$(dirname "$0")/.." || exit
+python -m examples.flexible_array $*

examples/who.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from cstruct import parse, getdef, typedef, MemCStruct, NATIVE_ORDER
+from cstruct import parse, getdef, MemCStruct, NATIVE_ORDER
 from pathlib import Path
 import argparse
 import sys
@@ -30,24 +30,28 @@
 #define UT_LINESIZE      32
 #define UT_NAMESIZE      32
 #define UT_HOSTSIZE     256
+
+typedef int pid_t;
+typedef long time_t;
 """
 )
 
-typedef("int", "pid_t")
-typedef("long", "time_t")
-
 
 class ExitStatus(MemCStruct):
-    __struct__ = """
-        short   e_termination;      /* Process termination status.  */
-        short   e_exit;             /* Process exit status.  */
+    __def__ = """
+        struct ExitStatus {
+            short   e_termination;      /* Process termination status.  */
+            short   e_exit;             /* Process exit status.  */
+        }
     """
 
 
 class Timeval(MemCStruct):
-    __struct__ = """
-        int32_t tv_sec;             /* Seconds.  */
-        int32_t tv_usec;            /* Microseconds.  */
+    __def__ = """
+        struct {
+            int32_t tv_sec;             /* Seconds.  */
+            int32_t tv_usec;            /* Microseconds.  */
+        }
     """
 
 
@@ -57,21 +61,25 @@ def str_from_c(string):
 
 class Utmp(MemCStruct):
     __byte_order__ = NATIVE_ORDER
-    __struct__ = """
-        short   ut_type;              /* Type of record */
-        pid_t   ut_pid;               /* PID of login process */
-        char    ut_line[UT_LINESIZE]; /* Device name of tty - "/dev/" */
-        char    ut_id[4];             /* Terminal name suffix, or inittab(5) ID */
-        char    ut_user[UT_NAMESIZE]; /* Username */
-        char    ut_host[UT_HOSTSIZE]; /* Hostname for remote login, or kernel version for run-level messages */
-        struct  ExitStatus ut_exit;   /* Exit status of a process marked as DEAD_PROCESS; not used by Linux init (1 */
-        int32_t ut_session;           /* Session ID (getsid(2)), used for windowing */
+    __def__ = """
+        typedef struct ExitStatus ExitStatus;
+
         struct {
-           int32_t tv_sec;            /* Seconds */
-           int32_t tv_usec;           /* Microseconds */
-        } ut_tv;                      /* Time entry was made */
-        int32_t ut_addr_v6[4];        /* Internet address of remote host; IPv4 address uses just ut_addr_v6[0] */
-        char __unused[20];            /* Reserved for future use */
+            short   ut_type;              /* Type of record */
+            pid_t   ut_pid;               /* PID of login process */
+            char    ut_line[UT_LINESIZE]; /* Device name of tty - "/dev/" */
+            char    ut_id[4];             /* Terminal name suffix, or inittab(5) ID */
+            char    ut_user[UT_NAMESIZE]; /* Username */
+            char    ut_host[UT_HOSTSIZE]; /* Hostname for remote login, or kernel version for run-level messages */
+            ExitStatus ut_exit;           /* Exit status of a process marked as DEAD_PROCESS; not used by Linux init (1 */
+            int32_t ut_session;           /* Session ID (getsid(2)), used for windowing */
+            struct {
+               int32_t tv_sec;            /* Seconds */
+               int32_t tv_usec;           /* Microseconds */
+            } ut_tv;                      /* Time entry was made */
+            int32_t ut_addr_v6[4];        /* Internet address of remote host; IPv4 address uses just ut_addr_v6[0] */
+            char __unused[20];            /* Reserved for future use */
+        }
     """
 
     @property

examples/who.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+cd "$(dirname "$0")/.." || exit
+python -m examples.who $*