Delivered-To: mlmmj-tyndur-devel
Received: from sv1.famkaufmann.info [176.9.73.67]
	by a9b8c5461646 with IMAP (fetchmail-6.3.26)
	for <mlmmj@localhost> (single-drop); Mon, 18 May 2020 11:24:33 +0000 (GMT)
Received: from localhost ([172.29.0.7])
	by sv1.famkaufmann.info with LMTP
	id 8h6JLlNwwl48QgAALHnFKQ
	(envelope-from <mayerNico@outlook.de>)
	for <mlmmj-tyndur-devel>; Mon, 18 May 2020 11:24:03 +0000
Delivered-To: tyndur-devel@tyndur.org
Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073021.outbound.protection.outlook.com [40.92.73.21])
	by sv1.famkaufmann.info (OpenSMTPD) with ESMTPS id 311e1734 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO)
	for <tyndur-devel@tyndur.org>;
	Mon, 18 May 2020 11:24:02 +0000 (UTC)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=Ihri8kN0IzEcLB3Eg6Y7XMaC21t7I6fELFaMVFVwathdYsvRXoOeLkdtzV9Sxml5t6xM2Cj91j9creIaFPV2X3wwIFYUKVhTEe+ec8Tf6lXvZIEJzw2GzHaEbjGFUbbwzYrVEnQtDOVYmWWpjfH64BQanKN6RvULUZXh1UYB2swtjcRk1SN3bYJsMJPX3o4XWPEdovm25Allu7d3bYGgBto85oipp5g3PIjmgGzLMNT5y8l00+oT+ecahW6MurwvXaIO8S5abxiAoychTcRa3nXkRMutyOc44Rqv9j/NPtYtqXxyACNXQZ78g9cDLzMHz6EIGFmgAZ+dK6ikIthJuA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=ohRR9ITmZgVwKbaC2GoYJpxPsEL5w5tnwxVhgmW17Aw=;
 b=lwtkr2DdWa7g/tc7Zol51nOz5YA98hjkiHy+0ANSZ7rt+4fKJdI9pjQ4hCTACxG0eGHraOA4T9ogIZ4eHxPMsWla51jDU6qSj/Q3OrIlCelR6u4zzNEu1MusZvy+DvMSQV4N3+kdNJXVaaGLNx9/TG6SSur2dRJfc6LPCc41SntgI1byY1+Cbl7s+LBaBOVlvndhslPxGHaxNe+QrmfQ25ApxlKuvzan67W451tlf0f/grPhJ8wdaCT8esCw9rh7urace2OvIMpkV1L+vhXrcxcyLKveryiQyYWJEdoXqsuTofzfscPouZNuBbnIawEngkLpvED28E2q3Qak0lbTng==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
 smtp.mailfrom=outlook.de; dmarc=pass action=none header.from=outlook.de;
 dkim=pass header.d=outlook.de; arc=none
Received: from HE1EUR04FT064.eop-eur04.prod.protection.outlook.com
 (2a01:111:e400:7e0d::49) by
 HE1EUR04HT051.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::188)
 with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.19; Mon, 18 May
 2020 11:24:01 +0000
Received: from AM0P191MB0500.EURP191.PROD.OUTLOOK.COM (2a01:111:e400:7e0d::53)
 by HE1EUR04FT064.mail.protection.outlook.com (2a01:111:e400:7e0d::226) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.19 via Frontend
 Transport; Mon, 18 May 2020 11:24:01 +0000
X-IncomingTopHeaderMarker:
 OriginalChecksum:CF2AB67B5ECAE23DBC0667540652713147F72020E86E5732590DC88D4433A7FD;UpperCasedChecksum:4AAFB03BAD66792DA8F6079D49B52F25BACD31B03A8C5E16A66D72CC4672715B;SizeAsReceived:8504;Count:47
Received: from AM0P191MB0500.EURP191.PROD.OUTLOOK.COM
 ([fe80::841c:6bcf:e911:3ec]) by AM0P191MB0500.EURP191.PROD.OUTLOOK.COM
 ([fe80::841c:6bcf:e911:3ec%7]) with mapi id 15.20.3000.034; Mon, 18 May 2020
 11:24:01 +0000
From: Nico Mayer <mayerNico@outlook.de>
To: tyndur-devel@tyndur.org
Subject: [PATCH] fdisk: Bugfix
Date: Mon, 18 May 2020 13:23:54 +0200
Message-ID:
 <AM0P191MB05009C10B1749D1BF09C1512D5B80@AM0P191MB0500.EURP191.PROD.OUTLOOK.COM>
X-Mailer: git-send-email 2.26.2
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-ClientProxiedBy: AM4PR0101CA0045.eurprd01.prod.exchangelabs.com
 (2603:10a6:200:41::13) To AM0P191MB0500.EURP191.PROD.OUTLOOK.COM
 (2603:10a6:208:4e::16)
X-Microsoft-Original-Message-ID: <20200518112354.93729-1-mayerNico@outlook.de>
Errors-To: toni@tyndur.org
Precedence: list
Reply-To: tyndur-Patches <tyndur-devel@tyndur.org>
List-Id: tyndur-Patches <tyndur-devel.tyndur.org>
List-Unsubscribe: <mailto:tyndur-devel+unsubscribe@tyndur.org>
List-Post: <mailto:tyndur-devel@tyndur.org>
List-Help: <mailto:tyndur-devel+help@tyndur.org>
List-Subscribe: <mailto:tyndur-devel+subscribe@tyndur.org>
List-Owner: <mailto:toni@tyndur.org>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (93.236.65.60) by AM4PR0101CA0045.eurprd01.prod.exchangelabs.com (2603:10a6:200:41::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3000.24 via Frontend Transport; Mon, 18 May 2020 11:24:01 +0000
X-Mailer: git-send-email 2.26.2
X-Microsoft-Original-Message-ID: <20200518112354.93729-1-mayerNico@outlook.de>
X-TMN: [lEyUPV+Pu071wXsivxKzOiiw81UuqqTa]
X-MS-PublicTrafficType: Email
X-IncomingHeaderCount: 47
X-EOPAttributedMessage: 0
X-MS-Office365-Filtering-Correlation-Id: d76bedfa-925a-4379-2b03-08d7fb1df6e7
X-MS-TrafficTypeDiagnostic: HE1EUR04HT051:
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info:
	Wtc6Vnn+vxZfeWPdbaSNnY9XcDecDXOEQnAGpG2znwSCkMR0ft+OMf2/UNb9V/nrWP7ZD05w6AmGYT+llTwADO0ZSqY4bfqkFkSv/vnXVd1vNATsb1x/o/rg3xt2bplft/+aqwSVRnaWQ81PNQkeBlPA0lv3MoIrBEEuEtD++fSVwmLn8LdKWlZh7pk5Om+YI47YJ7cNMmKZu3czyH/+Hg==
X-Forefront-Antispam-Report:
	CIP:255.255.255.255;CTRY:;LANG:en;SCL:0;SRV:;IPV:NLI;SFV:NSPM;H:AM0P191MB0500.EURP191.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFTY:;SFS:;DIR:OUT;SFP:1901;
X-MS-Exchange-AntiSpam-MessageData:
	3mJW28V8m6bA13uhQ5cqFxD6VAN6ghg3AY7h6UbBr8cW25Lctc6aIE19lCyu8/bOl13an+dnfjWwVBiBBXTohjhGNMF5yldHHIrqOC69OuJbm+Cstjsb6vDvwiL1JdVs7IjmU6jYFGBjhlmIAVTU5Q==
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d76bedfa-925a-4379-2b03-08d7fb1df6e7
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2020 11:24:01.5160
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-FromEntityHeader: Internet
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg:
	00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR04HT051

From: Nico Mayer <nico.mayer@steinbeis-stg.de>

! fdisk: In der Headerdatei partition.h werden zwei globale Variablen definiert (device_name und device_numheads). Dies kann zu einem Fehler beim Compilieren führen. Die beiden gobalen Variablen sollten sattdessen in partition.c definiert werden.
---
 src/modules/c/fdisk/partition.c | 48 ++++++++++++++++++---------------
 src/modules/c/fdisk/partition.h | 17 ++++++------
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/modules/c/fdisk/partition.c b/src/modules/c/fdisk/partition.c
index 0ee0645a..9bc06418 100644
--- a/src/modules/c/fdisk/partition.c
+++ b/src/modules/c/fdisk/partition.c
@@ -39,6 +39,12 @@
 #include "partition.h"
 #include "typeids.h"
 
+/// Ein Zeiger auf argv[1] oder besser gesagt den Laufwerksnamen
+char* device_name;
+
+/// Anzahl der Heads
+unsigned long device_numheads;
+
 /// Kopie des MBR
 unsigned char mbr[512];
 
@@ -53,10 +59,10 @@ void uncompress_chs(uint8_t* compressed, unsigned int* cylinder,
     unsigned int* head, unsigned int* sector)
 {
     *head = compressed[0];
-    
+
     *cylinder = (compressed[1] & 0xC0) << 2;
     *cylinder += compressed[2];
-    
+
     *sector = compressed[1] & 0x3F;
 }
 void compress_chs(uint8_t* compressed, unsigned int cylinder,
@@ -74,12 +80,12 @@ void compress_chs(uint8_t* compressed, unsigned int cylinder,
     if (sector < 1) {
         sector = 1;
     }
-    
+
     compressed[0] = head;
-    
+
     compressed[1] = (cylinder & 0x300) >> 2;
     compressed[1] += sector;
-    
+
     compressed[2] = cylinder & 0xFF;
 }
 unsigned int chs2lba(unsigned int cylinder, unsigned int head,
@@ -100,7 +106,7 @@ void lba2chs(unsigned int lba, unsigned int* cylinder, unsigned int* head,
 int apply_changes()
 {
     // TODO extended/logical partitions unterstuetzen
-    
+
     // Datei/Laufwerk oeffnen
     FILE* dev = fopen(device_name, "w");
     if (dev == 0) {
@@ -108,7 +114,7 @@ int apply_changes()
             "Aenderungen wurden nicht geschrieben!\n", device_name);
         return -1;
     }
-    
+
     // Die im RAM liegende Kopie des MBR aktualisieren, ohne jedoch den Code-
     // Teil zu aendern
     int i;
@@ -126,24 +132,24 @@ int apply_changes()
                 sizeof(struct partition_entry_t));
         }
     }
-    
+
     // Die Boot Signature nocheinmal setzen, um sicher zu gehen, dass diese
     // auch wirklich korrekt ist
     uint16_t* signature = (uint16_t*)(mbr + BOOT_SIGNATURE_POS);
     *signature = BOOT_SIGNATURE;
-    
+
     // Neuen MBR schreiben, den Output Buffer leeren und die Datei schliessen
     fwrite(mbr, 1, 512, dev);
     fflush(dev);
     fclose(dev);
-    
+
     return 0;
 }
 
 void delete_partition(struct partition_t* p)
 {
     // TODO extended/logical partitions unterstuetzen
-    
+
     memset(&(p->data), 0, sizeof(struct partition_entry_t));
     p->number = 0;
     p->exists = 0;
@@ -159,10 +165,10 @@ static void create_new_mbr_partition_table(void)
 int read_partitions(char* filename)
 {
     // TODO extended/logical partitions unterstuetzen
-    
+
     // Dateinamen speichern
     device_name = filename;
-    
+
     // Laufwerk/Datei oeffnen und MBR lesen
     FILE* dev = fopen(filename, "r");
     if (dev == 0) {
@@ -170,7 +176,7 @@ int read_partitions(char* filename)
         return -1;
     }
     fread(mbr, 1, 512, dev);
-    
+
     // Boot Signature ueberpruefen
     if (*(uint16_t*)(&mbr[BOOT_SIGNATURE_POS]) != BOOT_SIGNATURE) {
         printf("Ungueltige Boot Signatur!\nfdisk wird eine neue Partitions"
@@ -178,7 +184,7 @@ int read_partitions(char* filename)
             "beachtet werden.\n");
         create_new_mbr_partition_table();
     }
-    
+
     // Die Partitionstabelle analysieren und in die internen Strukturen
     // kopieren
     int i;
@@ -190,7 +196,7 @@ int read_partitions(char* filename)
         if (mbr_partitions[i].data.type) {
             mbr_partitions[i].number = i + 1;
             mbr_partitions[i].exists = 1;
-            
+
             // Handelt es sich um eine extended Partition?
             if (mbr_partitions[i].data.type == TYPE_EXTENDED_PARTITION_1 ||
                 mbr_partitions[i].data.type == TYPE_EXTENDED_PARTITION_2 ||
@@ -209,10 +215,10 @@ int read_partitions(char* filename)
             mbr_partitions[i].type = PARTITION_TYPE_PRIMARY;
         }
     }
-    
+
     // Datei schliessen
     fclose(dev);
-    
+
     return 0;
 }
 
@@ -220,19 +226,19 @@ void create_partition(struct partition_t* p, unsigned int number,
     unsigned int start_lba, unsigned int end_lba)
 {
     // TODO extended/logical partitions unterstuetzen
-    
+
     // Die LBA Daten ins CHS Format konvertieren
     unsigned int start_cyl, start_head, start_sec;
     lba2chs(start_lba, &start_cyl, &start_head, &start_sec);
     unsigned int end_cyl, end_head, end_sec;
     lba2chs(end_lba, &end_cyl, &end_head, &end_sec);
-    
+
     // Daraus die "komprimierten" CHS Eintraege erstellen
     uint8_t start_chs[3];
     compress_chs(start_chs, start_cyl, start_head, start_sec);
     uint8_t end_chs[3];
     compress_chs(end_chs, end_cyl, end_head, end_sec);
-    
+
     // Die Strukturen entsprechend anpassen
     p->exists = 1;
     p->number = number;
diff --git a/src/modules/c/fdisk/partition.h b/src/modules/c/fdisk/partition.h
index 8955983f..e02868a1 100644
--- a/src/modules/c/fdisk/partition.h
+++ b/src/modules/c/fdisk/partition.h
@@ -55,13 +55,8 @@
 #define PARTITION_TYPE_EXTENDED 1
 #define PARTITION_TYPE_LOGICAL 2
 
-/// Ein Zeiger auf argv[1] oder besser gesagt den Laufwerksnamen
-char* device_name;
-
-/// Anzahl der Heads
-unsigned long device_numheads;
 
-/** 
+/**
  * Ein einzelner Eintrag der Partitionstabelle, wie er auch auf der Festplatte
  * vorkommt.
  */
@@ -81,7 +76,7 @@ struct partition_t
     int exists;              ///< 1, wenn die Partition existiert; 0 wenn nicht
     unsigned int number;     ///< Nummer der Partition, beginnend mit 1
     int type;                ///< 0 = primary, 1 = extended, 2 = logical
-    
+
     struct partition_entry_t data; ///< Die eigentlichen Daten
 };
 
@@ -116,10 +111,16 @@ void delete_partition(struct partition_t* p);
 void create_partition(struct partition_t* p, unsigned int number,
     unsigned int start_lba, unsigned int end_lba);
 
-/// Kopie des MBR 
+/// Kopie des MBR
 extern unsigned char mbr[512];
 
 /// Array fuer die Primary Partitions
 extern struct partition_t mbr_partitions[4];
 
+/// Ein Zeiger auf argv[1] oder besser gesagt den Laufwerksnamen
+extern char* device_name;
+
+/// Anzahl der Heads
+extern unsigned long device_numheads;
+
 #endif
-- 
2.26.2

